mikros/serde
1
0
Fork 0
Code Issues Pull Requests Actions 1 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
commit d1e39db61e
5 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
serde/Cargo.toml
View File

@ -17,5 +17,5 @@ num-impls = ["num-bigint", "num-complex", "num-rational"]
num-rational = ["num/rational"]
[dependencies]
clippy = { version = "^0.0.35", optional = true }
clippy = { version = "^0.0.36", optional = true }
num = { version = "^0.1.27", default-features = false }

4
serde/src/de/impls.rs
View File

@ -154,7 +154,9 @@ impl<
fn visit_str<E>(&mut self, v: &str) -> Result<T, E>
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))
})
}
}

2
serde_codegen/Cargo.toml
View File

@ -20,7 +20,7 @@ syntex = { version = "^0.26.0", optional = true }
[dependencies]
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_macros = { version = "^0.4.0", optional = true }
syntex = { version = "^0.26.0", optional = true }

2
serde_macros/Cargo.toml
View File

@ -13,7 +13,7 @@ name = "serde_macros"
plugin = true
[dependencies]
clippy = "^0.0.35"
clippy = "^0.0.36"
serde_codegen = { version = "*", path = "../serde_codegen", default-features = false, features = ["nightly"] }
[dev-dependencies]

2
serde_tests/Cargo.toml
View File

@ -25,7 +25,7 @@ serde = { version = "*", path = "../serde", features = ["num-impls"] }
syntex = "^0.26.0"
[dependencies]
clippy = { version = "^0.0.35", optional = true }
clippy = { version = "^0.0.36", optional = true }
[[test]]
name = "test"