Commita8caff1

committed

Merge remote-tracking branch 'upstream/master' into remove-rustc-serialize-dependency

2 parentsb1306a4 +ab23ca8 commita8caff1Copy full SHA for a8caff1

File tree

+10

-10

lines changed

+10

-10

lines changed

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,7 @@`
`1`	`1`	`use bytes::BytesMut;`
`2`		`-use chrono_04::{DateTime,Duration,FixedOffset,Local,NaiveDate,NaiveDateTime,NaiveTime,Utc};`
	`2`	`+use chrono_04::{`
	`3`	`+DateTime,Duration,FixedOffset,Local,NaiveDate,NaiveDateTime,NaiveTime,TimeZone,Utc,`
	`4`	`+};`
`3`	`5`	`use postgres_protocol::types;`
`4`	`6`	`use std::error::Error;`
`5`	`7`
`@@ -40,7 +42,7 @@ impl ToSql for NaiveDateTime {`
`40`	`42`	`impl<'a>FromSql<'a>forDateTime<Utc>{`
`41`	`43`	`fnfrom_sql(type_:&Type,raw:&[u8]) ->Result<DateTime<Utc>,Box<dynError +Sync +Send>>{`
`42`	`44`	`let naive =NaiveDateTime::from_sql(type_, raw)?;`
`43`		`-Ok(DateTime::from_utc(naive,Utc))`
	`45`	`+Ok(Utc.from_utc_datetime(&naive))`
`44`	`46`	`}`
`45`	`47`
`46`	`48`	`accepts!(TIMESTAMPTZ);`

Lines changed: 6 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -53,10 +53,9 @@ async fn test_with_special_naive_date_time_params() {`
`53`	`53`	`asyncfntest_date_time_params(){`
`54`	`54`	`fnmake_check(time:&str) ->(Option<DateTime<Utc>>,&str){`
`55`	`55`	`(`
`56`		`-Some(`
`57`		`-Utc.datetime_from_str(time,"'%Y-%m-%d %H:%M:%S.%f'")`
`58`		`-.unwrap(),`
`59`		`-),`
	`56`	`+Some(Utc.from_utc_datetime(`
	`57`	`+&NaiveDateTime::parse_from_str(time,"'%Y-%m-%d %H:%M:%S.%f'").unwrap(),`
	`58`	`+)),`
`60`	`59`	`time,`
`61`	`60`	`)`
`62`	`61`	`}`
`@@ -76,10 +75,9 @@ async fn test_date_time_params() {`
`76`	`75`	`asyncfntest_with_special_date_time_params(){`
`77`	`76`	`fnmake_check(time:&str) ->(Timestamp<DateTime<Utc>>,&str){`
`78`	`77`	`(`
`79`		`-Timestamp::Value(`
`80`		`-Utc.datetime_from_str(time,"'%Y-%m-%d %H:%M:%S.%f'")`
`81`		`-.unwrap(),`
`82`		`-),`
	`78`	`+Timestamp::Value(Utc.from_utc_datetime(`
	`79`	`+&NaiveDateTime::parse_from_str(time,"'%Y-%m-%d %H:%M:%S.%f'").unwrap(),`
	`80`	`+)),`
`83`	`81`	`time,`
`84`	`82`	`)`
`85`	`83`	`}`

Comments

(0)