pezkuwichain/serde
1
0
Fork 0
mirror of https://github.com/pezkuwichain/serde.git synced 2026-06-13 11:21:01 +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-18 13:09:31 -08:00
parent 42b8b6153e 77edd8e544
commit d1e39db61e
5 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
serde/Cargo.toml
+1 -1
View File
@@ -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.35", optional = true } clippy = { version = "^0.0.36", optional = true }
num = { version = "^0.1.27", default-features = false } num = { version = "^0.1.27", default-features = false }
serde/src/de/impls.rs
+3 -1
View File
@@ -154,7 +154,9 @@ impl<
fn visit_str<E>(&mut self, v: &str) -> Result<T, E> fn visit_str<E>(&mut self, v: &str) -> Result<T, E>
where E: Error, where E: Error,
{ {
str::FromStr::from_str(v.trim()).or(Err(Error::type_mismatch(Type::Str))) str::FromStr::from_str(v.trim()).or_else(|_| {
Err(Error::type_mismatch(Type::Str))
})
} }
} }
serde_codegen/Cargo.toml
+1 -1
View File
@@ -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.35", optional = true } clippy = { version = "^0.0.36", 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
+1 -1
View File
@@ -13,7 +13,7 @@ name = "serde_macros"
plugin = true plugin = true
[dependencies] [dependencies]
clippy = "^0.0.35" clippy = "^0.0.36"
serde_codegen = { version = "*", path = "../serde_codegen", default-features = false, features = ["nightly"] } serde_codegen = { version = "*", path = "../serde_codegen", default-features = false, features = ["nightly"] }
[dev-dependencies] [dev-dependencies]
serde_tests/Cargo.toml
+1 -1
View File
@@ -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.35", optional = true } clippy = { version = "^0.0.36", optional = true }
[[test]] [[test]]
name = "test" name = "test"