Merge branch 'master' into '1.0'

Conflicts:
    serde/src/macros.rs
This commit is contained in:
David Tolnay 2017-04-05 15:10:18 -07:00
commit a7f6ad137a
No known key found for this signature in database
GPG Key ID: F9BA143B95FF6D82
4 changed files with 4 additions and 19 deletions

View File

@ -1,6 +1,6 @@
[package]
name = "serde"
version = "0.9.12"
version = "0.9.13"
authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
license = "MIT/Apache-2.0"
description = "A generic serialization/deserialization framework"

View File

@ -1,24 +1,9 @@
#[cfg(feature = "std")]
#[doc(hidden)]
#[macro_export]
macro_rules! forward_to_deserialize_method {
($func:ident($($arg:ty),*)) => {
#[inline]
fn $func<__V>(self, $(_: $arg,)* visitor: __V) -> ::std::result::Result<__V::Value, Self::Error>
where __V: $crate::de::Visitor<'de>
{
self.deserialize(visitor)
}
};
}
#[cfg(not(feature = "std"))]
#[doc(hidden)]
#[macro_export]
macro_rules! forward_to_deserialize_method {
($func:ident($($arg:ty),*)) => {
#[inline]
fn $func<__V>(self, $(_: $arg,)* visitor: __V) -> ::core::result::Result<__V::Value, Self::Error>
fn $func<__V>(self, $(_: $arg,)* visitor: __V) -> $crate::export::Result<__V::Value, Self::Error>
where __V: $crate::de::Visitor<'de>
{
self.deserialize(visitor)

View File

@ -1,6 +1,6 @@
[package]
name = "serde_derive"
version = "0.9.12"
version = "0.9.13"
authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
license = "MIT/Apache-2.0"
description = "Macros 1.1 implementation of #[derive(Serialize, Deserialize)]"

View File

@ -1,6 +1,6 @@
[package]
name = "serde_test"
version = "0.9.12"
version = "0.9.13"
authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
license = "MIT/Apache-2.0"
description = "Token De/Serializer for testing De/Serialize implementations"