Merge with upstream

Author: zonyitoo

serde-tests/test.rs

@@ -132,7 +132,7 @@ fn application_decode_error() {
     struct Range10(usize);
     impl<'de> Deserialize<'de> for Range10 {
         fn deserialize<D: Deserializer<'de>>(d: D) -> Result<Range10, D::Error> {
-            let x: usize = try!(Deserialize::deserialize(d));
+            let x: usize = Deserialize::deserialize(d)?;
             if x > 10 {
                 Err(serde::de::Error::invalid_value(Unexpected::Unsigned(x as u64),
                                                     &"more than 10"))

src/decoder/serde.rs

@@ -319,8 +319,10 @@ impl<'de> Deserializer<'de> for Decoder {
         // enums are encoded in json as maps with a single key:value pair
         match iter.next() {
             Some(_) => Err(DecoderError::InvalidType("expected a single key:value pair".to_owned())),
-            None => visitor.visit_enum(EnumDecoder { val: Bson::String(variant),
-                                                     decoder: VariantDecoder { val: Some(value) }, }),
+            None => {
+                visitor.visit_enum(EnumDecoder { val: Bson::String(variant),
+                                                 decoder: VariantDecoder { val: Some(value) }, })
+            }
         }
     }
 

src/encoder/mod.rs

@@ -107,8 +107,7 @@ fn encode_bson<W: Write + ?Sized>(writer: &mut W, key: &str, val: &Bson) -> Enco
         &Bson::String(ref v) => write_string(writer, &v),
         &Bson::Array(ref v) => encode_array(writer, &v),
         &Bson::Document(ref v) => encode_document(writer, v),
-        &Bson::Boolean(v) => writer.write_u8(if v { 0x01 } else { 0x00 })
-                                   .map_err(From::from),
+        &Bson::Boolean(v) => writer.write_u8(if v { 0x01 } else { 0x00 }).map_err(From::from),
         &Bson::RegExp(ref pat, ref opt) => {
             write_cstring(writer, pat)?;
             write_cstring(writer, opt)
@@ -131,10 +130,7 @@ fn encode_bson<W: Write + ?Sized>(writer: &mut W, key: &str, val: &Bson) -> Enco
             writer.write_u8(From::from(subtype))?;
             writer.write_all(data).map_err(From::from)
         }
-        &Bson::UtcDatetime(ref v) => {
-            write_i64(writer,
-                      (v.timestamp() * 1000) + (v.nanosecond() / 1000000) as i64)
-        }
+        &Bson::UtcDatetime(ref v) => write_i64(writer, (v.timestamp() * 1000) + (v.nanosecond() / 1000000) as i64),
         &Bson::Null => Ok(()),
         &Bson::Symbol(ref v) => write_string(writer, &v),
     }