Resolve merge conflicts

serde/Cargo.toml

@@ -1,12 +1,6 @@
 [package]
 name = "serde"
-<<<<<<< HEAD
+version = "0.9.14" # remember to update html_root_url
-version = "0.9.13" # remember to update html_root_url
-||||||| merged common ancestors
-version = "0.9.13"
-=======
-version = "0.9.14"
->>>>>>> origin/master
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
 license = "MIT/Apache-2.0"
 description = "A generic serialization/deserialization framework"

serde/src/de/impls.rs

@@ -12,82 +12,7 @@ use de::{Deserialize, Deserializer, EnumAccess, Error, SeqAccess, Unexpected, Va
          Visitor};
 
 #[cfg(any(feature = "std", feature = "collections"))]
-<<<<<<< HEAD
 use de::MapAccess;
-||||||| merged common ancestors
-use core::cmp;
-use core::fmt;
-#[cfg(feature = "std")]
-use core::hash::{Hash, BuildHasher};
-use core::marker::PhantomData;
-#[cfg(feature = "std")]
-use std::net;
-#[cfg(feature = "std")]
-use std::path;
-use core::str;
-#[cfg(feature = "std")]
-use std::ffi::{CString, OsString};
-#[cfg(all(feature = "std", feature="unstable"))]
-use std::ffi::CStr;
-
-#[cfg(feature = "std")]
-use std::rc::Rc;
-#[cfg(all(feature = "alloc", not(feature = "std")))]
-use alloc::rc::Rc;
-
-#[cfg(feature = "std")]
-use std::sync::Arc;
-#[cfg(all(feature = "alloc", not(feature = "std")))]
-use alloc::arc::Arc;
-
-#[cfg(all(feature = "alloc", not(feature = "std")))]
-use alloc::boxed::Box;
-
-#[cfg(feature = "std")]
-use std::time::Duration;
-
-#[cfg(feature = "std")]
-use std;
-=======
-use core::cmp;
-use core::fmt;
-#[cfg(feature = "std")]
-use core::hash::{Hash, BuildHasher};
-use core::marker::PhantomData;
-#[cfg(feature = "std")]
-use std::net;
-#[cfg(feature = "std")]
-use std::path;
-use core::str;
-#[cfg(feature = "std")]
-use std::ffi::{CString, OsString};
-#[cfg(all(feature = "std", feature="unstable"))]
-use std::ffi::CStr;
-
-#[cfg(feature = "std")]
-use std::rc::Rc;
-#[cfg(all(feature = "alloc", not(feature = "std")))]
-use alloc::rc::Rc;
-
-#[cfg(feature = "std")]
-use std::sync::Arc;
-#[cfg(all(feature = "alloc", not(feature = "std")))]
-use alloc::arc::Arc;
-
-#[cfg(all(feature = "alloc", not(feature = "std")))]
-use alloc::boxed::Box;
-
-use core::cell::{Cell, RefCell};
-
-#[cfg(feature = "std")]
-use std::sync::{Mutex, RwLock};
-
-#[cfg(feature = "std")]
-use std::time::Duration;
-
-#[cfg(feature = "std")]
-use std;
->>>>>>> origin/master
 
 use de::from_primitive::FromPrimitive;
 
@@ -1210,51 +1135,59 @@ where
     }
 }
 
-<<<<<<< HEAD
 ////////////////////////////////////////////////////////////////////////////////
-||||||| merged common ancestors
+
-///////////////////////////////////////////////////////////////////////////////
+impl<'de, T> Deserialize<'de> for Cell<T>
-=======
+where
-impl<T: Deserialize + Copy> Deserialize for Cell<T> {
+    T: Deserialize<'de> + Copy,
+{
     fn deserialize<D>(deserializer: D) -> Result<Cell<T>, D::Error>
-        where D: Deserializer
+    where
+        D: Deserializer<'de>,
     {
-        let val = try!(Deserialize::deserialize(deserializer));
+        T::deserialize(deserializer).map(Cell::new)
-        Ok(Cell::new(val))
     }
 }
 
-impl<T: Deserialize> Deserialize for RefCell<T> {
+impl<'de, T> Deserialize<'de> for RefCell<T>
+where
+    T: Deserialize<'de>
+{
     fn deserialize<D>(deserializer: D) -> Result<RefCell<T>, D::Error>
-        where D: Deserializer
+    where
+        D: Deserializer<'de>,
     {
-        let val = try!(Deserialize::deserialize(deserializer));
+        T::deserialize(deserializer).map(RefCell::new)
-        Ok(RefCell::new(val))
     }
 }
 
 #[cfg(feature = "std")]
-impl<T: Deserialize> Deserialize for Mutex<T> {
+impl<'de, T> Deserialize<'de> for Mutex<T>
+where
+    T: Deserialize<'de>,
+{
     fn deserialize<D>(deserializer: D) -> Result<Mutex<T>, D::Error>
-        where D: Deserializer
+    where
+        D: Deserializer<'de>,
     {
-        let val = try!(Deserialize::deserialize(deserializer));
+        T::deserialize(deserializer).map(Mutex::new)
-        Ok(Mutex::new(val))
     }
 }
 
 #[cfg(feature = "std")]
-impl<T: Deserialize> Deserialize for RwLock<T> {
+impl<'de, T> Deserialize<'de> for RwLock<T>
+where
+    T: Deserialize<'de>,
+{
     fn deserialize<D>(deserializer: D) -> Result<RwLock<T>, D::Error>
-        where D: Deserializer
+    where
+        D: Deserializer<'de>,
     {
-        let val = try!(Deserialize::deserialize(deserializer));
+        T::deserialize(deserializer).map(RwLock::new)
-        Ok(RwLock::new(val))
     }
 }
 
-///////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
->>>>>>> origin/master
 
 // This is a cleaned-up version of the impl generated by:
 //

serde/src/lib.rs

@@ -129,6 +129,7 @@ mod lib {
     pub use self::core::{u8, u16, u32, u64, usize};
     pub use self::core::{f32, f64};
 
+    pub use self::core::cell::{Cell, RefCell};
     pub use self::core::clone::{self, Clone};
     pub use self::core::convert::{self, From, Into};
     pub use self::core::default::{self, Default};
@@ -187,6 +188,8 @@ mod lib {
     pub use std::path::{Path, PathBuf};
     #[cfg(feature = "std")]
     pub use std::time::Duration;
+    #[cfg(feature = "std")]
+    pub use std::sync::{Mutex, RwLock};
 
     #[cfg(feature = "unstable")]
     pub use core::nonzero::{NonZero, Zeroable};

serde/src/ser/impls.rs

@@ -13,18 +13,7 @@ use ser::{Serialize, SerializeTuple, Serializer};
 #[cfg(feature = "std")]
 use ser::Error;
 
-<<<<<<< HEAD
 ////////////////////////////////////////////////////////////////////////////////
-||||||| merged common ancestors
-use core::marker::PhantomData;
-=======
-use core::cell::{Cell, RefCell};
-
-#[cfg(feature = "std")]
-use std::sync::{Mutex, RwLock};
-
-use core::marker::PhantomData;
->>>>>>> origin/master
 
 macro_rules! primitive_impl {
     ($ty:ident, $method:ident $($cast:tt)*) => {
@@ -360,28 +349,27 @@ deref_impl!(<'a, T: ?Sized> Serialize for Cow<'a, T> where T: Serialize + ToOwne
 #[cfg(feature = "unstable")]
 deref_impl!(<T> Serialize for NonZero<T> where T: Serialize + Zeroable);
 
-<<<<<<< HEAD
 ////////////////////////////////////////////////////////////////////////////////
-||||||| merged common ancestors
+
-///////////////////////////////////////////////////////////////////////////////
-=======
 impl<T> Serialize for Cell<T>
-    where T: Serialize + Copy
+where
+    T: Serialize + Copy,
 {
-    #[inline]
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-        where S: Serializer
+    where
+        S: Serializer,
     {
         self.get().serialize(serializer)
     }
 }
 
 impl<T> Serialize for RefCell<T>
-    where T: Serialize
+where
+    T: Serialize,
 {
-    #[inline]
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-        where S: Serializer
+    where
+        S: Serializer,
     {
         self.borrow().serialize(serializer)
     }
@@ -389,11 +377,12 @@ impl<T> Serialize for RefCell<T>
 
 #[cfg(feature = "std")]
 impl<T> Serialize for Mutex<T>
-    where T: Serialize
+where
+    T: Serialize,
 {
-    #[inline]
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-        where S: Serializer
+    where
+        S: Serializer,
     {
         match self.lock() {
             Ok(locked) => locked.serialize(serializer),
@@ -404,11 +393,12 @@ impl<T> Serialize for Mutex<T>
 
 #[cfg(feature = "std")]
 impl<T> Serialize for RwLock<T>
-    where T: Serialize
+where
+    T: Serialize,
 {
-    #[inline]
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-        where S: Serializer
+    where
+        S: Serializer,
     {
         match self.read() {
             Ok(locked) => locked.serialize(serializer),
@@ -417,8 +407,7 @@ impl<T> Serialize for RwLock<T>
     }
 }
 
-///////////////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
->>>>>>> origin/master
 
 impl<T, E> Serialize for Result<T, E>
 where

serde_derive/Cargo.toml

@@ -1,12 +1,6 @@
 [package]
 name = "serde_derive"
-<<<<<<< HEAD
+version = "0.9.14" # remember to update html_root_url
-version = "0.9.13" # remember to update html_root_url
-||||||| merged common ancestors
-version = "0.9.13"
-=======
-version = "0.9.14"
->>>>>>> origin/master
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
 license = "MIT/Apache-2.0"
 description = "Macros 1.1 implementation of #[derive(Serialize, Deserialize)]"

serde_test/Cargo.toml

@@ -1,12 +1,6 @@
 [package]
 name = "serde_test"
-<<<<<<< HEAD
+version = "0.9.14" # remember to update html_root_url
-version = "0.9.13" # remember to update html_root_url
-||||||| merged common ancestors
-version = "0.9.13"
-=======
-version = "0.9.14"
->>>>>>> origin/master
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
 license = "MIT/Apache-2.0"
 description = "Token De/Serializer for testing De/Serialize implementations"