Upgrade chrono deps to v0.4 (#77)

Author: mmun

Cargo.toml

@@ -16,7 +16,7 @@ name = "bson"
 
 [dependencies]
 byteorder = "1.0"
-chrono = "0.3"
+chrono = "0.4"
 libc = "0.2"
 rand = "0.3"
 rust-crypto = "0.2"

examples/encode.rs

@@ -10,7 +10,7 @@ fn main() {
 
     let mut arr = Array::new();
     arr.push(Bson::String("blah".to_string()));
-    arr.push(Bson::UtcDatetime(chrono::UTC::now()));
+    arr.push(Bson::UtcDatetime(chrono::Utc::now()));
     arr.push(Bson::ObjectId(oid::ObjectId::with_bytes([1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12])));
 
     doc.insert("array".to_string(), Bson::Array(arr));

src/bson.rs

@@ -24,7 +24,7 @@
 use std::fmt::{self, Display, Debug};
 use std::ops::{Deref, DerefMut};
 
-use chrono::{DateTime, Timelike, UTC};
+use chrono::{DateTime, Timelike, Utc};
 use chrono::offset::TimeZone;
 use serde_json::Value;
 use hex::{FromHex, ToHex};
@@ -69,7 +69,7 @@ pub enum Bson {
     /// [ObjectId](http://dochub.mongodb.org/core/objectids)
     ObjectId(oid::ObjectId),
     /// UTC datetime
-    UtcDatetime(DateTime<UTC>),
+    UtcDatetime(DateTime<Utc>),
     /// Symbol (Deprecated)
     Symbol(String),
 }
@@ -258,8 +258,8 @@ impl From<oid::ObjectId> for Bson {
     }
 }
 
-impl From<DateTime<UTC>> for Bson {
-    fn from(a: DateTime<UTC>) -> Bson {
+impl From<DateTime<Utc>> for Bson {
+    fn from(a: DateTime<Utc>) -> Bson {
         Bson::UtcDatetime(a)
     }
 }
@@ -479,7 +479,7 @@ impl Bson {
             } else if let Ok(long) = values
                           .get_document("$date")
                           .and_then(|inner| inner.get_i64("$numberLong")) {
-                return Bson::UtcDatetime(UTC.timestamp(long / 1000,
+                return Bson::UtcDatetime(Utc.timestamp(long / 1000,
                                                        ((long % 1000) * 1000000) as u32));
             } else if let Ok(sym) = values.get_str("$symbol") {
                 return Bson::Symbol(sym.to_owned());
@@ -557,7 +557,7 @@ impl Bson {
     }
 
     /// If `Bson` is `UtcDateTime`, return its value. Returns `None` otherwise
-    pub fn as_utc_date_time(&self) -> Option<&DateTime<UTC>> {
+    pub fn as_utc_date_time(&self) -> Option<&DateTime<Utc>> {
         match *self {
             Bson::UtcDatetime(ref v) => Some(v),
             _ => None,
@@ -605,30 +605,30 @@ impl Bson {
 /// }
 /// ```
 #[derive(Debug, Eq, PartialEq, Copy, Clone)]
-pub struct UtcDateTime(pub DateTime<UTC>);
+pub struct UtcDateTime(pub DateTime<Utc>);
 
 impl Deref for UtcDateTime {
-    type Target = DateTime<UTC>;
+    type Target = DateTime<Utc>;
 
     fn deref(&self) -> &Self::Target {
         &self.0
     }
 }
 
 impl DerefMut for UtcDateTime {
-    fn deref_mut(&mut self) -> &mut DateTime<UTC> {
+    fn deref_mut(&mut self) -> &mut DateTime<Utc> {
         &mut self.0
     }
 }
 
-impl Into<DateTime<UTC>> for UtcDateTime {
-    fn into(self) -> DateTime<UTC> {
+impl Into<DateTime<Utc>> for UtcDateTime {
+    fn into(self) -> DateTime<Utc> {
         self.0
     }
 }
 
-impl From<DateTime<UTC>> for UtcDateTime {
-    fn from(x: DateTime<UTC>) -> Self {
+impl From<DateTime<Utc>> for UtcDateTime {
+    fn from(x: DateTime<Utc>) -> Self {
         UtcDateTime(x)
     }
 }

src/decoder/mod.rs

@@ -30,7 +30,7 @@ pub use self::serde::Decoder;
 use std::io::Read;
 
 use byteorder::{LittleEndian, ReadBytesExt};
-use chrono::UTC;
+use chrono::Utc;
 use chrono::offset::TimeZone;
 
 use spec::{self, BinarySubtype};
@@ -169,7 +169,7 @@ fn decode_bson<R: Read + ?Sized>(reader: &mut R, tag: u8) -> DecoderResult<Bson>
         Some(TimeStamp) => read_i64(reader).map(Bson::TimeStamp),
         Some(UtcDatetime) => {
             let time = try!(read_i64(reader));
-            Ok(Bson::UtcDatetime(UTC.timestamp(time / 1000, (time % 1000) as u32 * 1000000)))
+            Ok(Bson::UtcDatetime(Utc.timestamp(time / 1000, (time % 1000) as u32 * 1000000)))
         }
         Some(Symbol) => read_string(reader).map(Bson::Symbol),
         Some(Undefined) | Some(DbPointer) | Some(MaxKey) | Some(MinKey) | None => {

src/ordered.rs

@@ -5,7 +5,7 @@ use std::fmt::{self, Debug, Display, Formatter};
 use std::iter::{FromIterator, Map};
 use std::marker::PhantomData;
 
-use chrono::{DateTime, UTC};
+use chrono::{DateTime, Utc};
 
 use linked_hash_map::{self, LinkedHashMap};
 
@@ -288,7 +288,7 @@ impl OrderedDocument {
     }
 
     /// Get a UTC datetime value for this key if it exists and has the correct type.
-    pub fn get_utc_datetime(&self, key: &str) -> ValueAccessResult<&DateTime<UTC>> {
+    pub fn get_utc_datetime(&self, key: &str) -> ValueAccessResult<&DateTime<Utc>> {
         match self.get(key) {
             Some(&Bson::UtcDatetime(ref v)) => Ok(v),
             Some(_) => Err(ValueAccessError::UnexpectedType),

tests/lib.rs

@@ -8,7 +8,7 @@ mod modules;
 use bson::Bson;
 use bson::spec::BinarySubtype;
 use bson::oid::ObjectId;
-use chrono::offset::utc::UTC;
+use chrono::offset::Utc;
 use hex::ToHex;
 
 #[test]
@@ -22,7 +22,7 @@ fn test_format() {
     }
 
     let id = ObjectId::with_bytes(bytes);
-    let date = UTC::now();
+    let date = Utc::now();
 
     let doc = doc! {
         "float" => 2.4,

tests/modules/encoder_decoder.rs

@@ -5,7 +5,7 @@ use std::io::Cursor;
 use bson::{Bson, decode_document, encode_document};
 use bson::oid::ObjectId;
 use bson::spec::BinarySubtype;
-use chrono::UTC;
+use chrono::Utc;
 use chrono::offset::TimeZone;
 
 #[test]
@@ -239,7 +239,7 @@ fn test_encode_decode_object_id() {
 
 #[test]
 fn test_encode_utc_date_time() {
-    let src = UTC.timestamp(1286705410, 0);
+    let src = Utc.timestamp(1286705410, 0);
     let dst = vec![18, 0, 0, 0, 9, 107, 101, 121, 0, 208, 111, 158, 149, 43, 1, 0, 0, 0];
 
     let doc = doc!{ "key" => src };

tests/modules/ordered.rs

@@ -2,7 +2,7 @@ use bson::{Bson, Document};
 use bson::ValueAccessError;
 use bson::spec::BinarySubtype;
 use bson::oid::ObjectId;
-use chrono::UTC;
+use chrono::Utc;
 
 #[test]
 fn ordered_insert() {
@@ -40,7 +40,7 @@ fn ordered_insert_shorthand() {
 
 #[test]
 fn test_getters() {
-    let datetime = UTC::now();
+    let datetime = Utc::now();
     let cloned_dt = datetime.clone();
     let binary = vec![0, 1, 2, 3, 4];
     let mut doc = doc! {

tests/serde.rs

@@ -60,15 +60,15 @@ fn test_de_map() {
 
 #[test]
 fn test_ser_datetime() {
-    use chrono::{UTC, Timelike};
+    use chrono::{Utc, Timelike};
     use bson::UtcDateTime;
 
     #[derive(Serialize, Deserialize, Eq, PartialEq, Debug)]
     struct Foo {
         date: UtcDateTime,
     }
 
-    let now = UTC::now();
+    let now = Utc::now();
     // FIXME: Due to BSON's datetime precision
     let now = now.with_nanosecond(now.nanosecond() / 1000000 * 1000000).unwrap();