pezkuwichain/serde
1
0
Fork 0
mirror of https://github.com/pezkuwichain/serde.git synced 2026-06-19 16:51:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v0.6.x'

Browse Source
This commit is contained in:
Erick Tryzelaar
2016-01-26 14:06:43 -08:00
parent b2acda333b a5d0703e44
commit c072025982
5 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
serde/Cargo.toml
+2 -2
View File
@@ -1,6 +1,6 @@
[package] [package]
name = "serde" name = "serde"
version = "0.6.10" version = "0.6.11"
authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"] authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
license = "MIT/Apache-2.0" license = "MIT/Apache-2.0"
description = "A generic serialization/deserialization framework" description = "A generic serialization/deserialization framework"
@@ -17,5 +17,5 @@ num-impls = ["num-bigint", "num-complex", "num-rational"]
num-rational = ["num/rational"] num-rational = ["num/rational"]
[dependencies] [dependencies]
clippy = { version = "^0.0.36", optional = true } clippy = { version = "^0.0.37", optional = true }
num = { version = "^0.1.27", default-features = false } num = { version = "^0.1.27", default-features = false }
serde/src/de/impls.rs
+7
View File
@@ -283,6 +283,13 @@ impl<
> Visitor for OptionVisitor<T> { > Visitor for OptionVisitor<T> {
type Value = Option<T>; type Value = Option<T>;
#[inline]
fn visit_unit<E>(&mut self) -> Result<Option<T>, E>
where E: Error,
{
Ok(None)
}
#[inline] #[inline]
fn visit_none<E>(&mut self) -> Result<Option<T>, E> fn visit_none<E>(&mut self) -> Result<Option<T>, E>
where E: Error, where E: Error,
serde_codegen/Cargo.toml
+2 -2
View File
@@ -1,6 +1,6 @@
[package] [package]
name = "serde_codegen" name = "serde_codegen"
version = "0.6.10" version = "0.6.11"
authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"] authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
license = "MIT/Apache-2.0" license = "MIT/Apache-2.0"
description = "Macros to auto-generate implementations for the serde framework" description = "Macros to auto-generate implementations for the serde framework"
@@ -20,7 +20,7 @@ syntex = { version = "^0.26.0", optional = true }
[dependencies] [dependencies]
aster = { version = "^0.10.0", default-features = false } aster = { version = "^0.10.0", default-features = false }
clippy = { version = "^0.0.36", optional = true } clippy = { version = "^0.0.37", optional = true }
quasi = { version = "^0.4.0", default-features = false } quasi = { version = "^0.4.0", default-features = false }
quasi_macros = { version = "^0.4.0", optional = true } quasi_macros = { version = "^0.4.0", optional = true }
syntex = { version = "^0.26.0", optional = true } syntex = { version = "^0.26.0", optional = true }
serde_macros/Cargo.toml
+2 -2
View File
@@ -1,6 +1,6 @@
[package] [package]
name = "serde_macros" name = "serde_macros"
version = "0.6.10" version = "0.6.11"
authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"] authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
license = "MIT/Apache-2.0" license = "MIT/Apache-2.0"
description = "Macros to auto-generate implementations for the serde framework" description = "Macros to auto-generate implementations for the serde framework"
@@ -13,7 +13,7 @@ name = "serde_macros"
plugin = true plugin = true
[dependencies] [dependencies]
clippy = "^0.0.36" clippy = "^0.0.37"
serde_codegen = { version = "^0.6.10", path = "../serde_codegen", default-features = false, features = ["nightly"] } serde_codegen = { version = "^0.6.10", path = "../serde_codegen", default-features = false, features = ["nightly"] }
[dev-dependencies] [dev-dependencies]
serde_tests/Cargo.toml
+2 -2
View File
@@ -1,6 +1,6 @@
[package] [package]
name = "serde_tests" name = "serde_tests"
version = "0.6.2" version = "0.6.3"
authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"] authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
license = "MIT/Apache-2.0" license = "MIT/Apache-2.0"
description = "A generic serialization/deserialization framework" description = "A generic serialization/deserialization framework"
@@ -25,7 +25,7 @@ serde = { version = "*", path = "../serde", features = ["num-impls"] }
syntex = "^0.26.0" syntex = "^0.26.0"
[dependencies] [dependencies]
clippy = { version = "^0.0.36", optional = true } clippy = { version = "^0.0.37", optional = true }
[[test]] [[test]]
name = "test" name = "test"