diff --git a/serde/Cargo.toml b/serde/Cargo.toml index 125f4196..0879175a 100644 --- a/serde/Cargo.toml +++ b/serde/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "serde" -version = "0.6.12" +version = "0.6.13" authors = ["Erick Tryzelaar "] license = "MIT/Apache-2.0" description = "A generic serialization/deserialization framework" @@ -17,5 +17,5 @@ num-impls = ["num-bigint", "num-complex", "num-rational"] num-rational = ["num/rational"] [dependencies] -clippy = { version = "^0.0.39", optional = true } +clippy = { version = "^0.0.41", optional = true } num = { version = "^0.1.27", default-features = false } diff --git a/serde_codegen/Cargo.toml b/serde_codegen/Cargo.toml index 46b3ec8a..21d7c1b4 100644 --- a/serde_codegen/Cargo.toml +++ b/serde_codegen/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "serde_codegen" -version = "0.6.12" +version = "0.6.13" authors = ["Erick Tryzelaar "] license = "MIT/Apache-2.0" description = "Macros to auto-generate implementations for the serde framework" @@ -16,13 +16,13 @@ nightly-testing = ["clippy"] with-syntex = ["quasi/with-syntex", "quasi_codegen", "quasi_codegen/with-syntex", "syntex", "syntex_syntax"] [build-dependencies] -quasi_codegen = { version = "^0.5.0", optional = true } -syntex = { version = "^0.27.0", optional = true } +quasi_codegen = { version = "^0.6.0", optional = true } +syntex = { version = "^0.28.0", optional = true } [dependencies] -aster = { version = "^0.11.0", default-features = false } -clippy = { version = "^0.0.39", optional = true } -quasi = { version = "^0.5.0", default-features = false } -quasi_macros = { version = "^0.5.0", optional = true } -syntex = { version = "^0.27.0", optional = true } -syntex_syntax = { version = "^0.27.0", optional = true } +aster = { version = "^0.12.0", default-features = false } +clippy = { version = "^0.0.41", optional = true } +quasi = { version = "^0.6.0", default-features = false } +quasi_macros = { version = "^0.6.0", optional = true } +syntex = { version = "^0.28.0", optional = true } +syntex_syntax = { version = "^0.28.0", optional = true } diff --git a/serde_codegen/src/de.rs b/serde_codegen/src/de.rs index 8f6860b5..d835f5e5 100644 --- a/serde_codegen/src/de.rs +++ b/serde_codegen/src/de.rs @@ -397,7 +397,7 @@ fn deserialize_seq( struct_path: ast::Path, fields: usize, ) -> P { - let let_values: Vec> = (0 .. fields) + let let_values: Vec = (0 .. fields) .map(|i| { let name = builder.id(format!("__field{}", i)); quote_stmt!(cx, @@ -431,7 +431,7 @@ fn deserialize_struct_as_seq( struct_path: ast::Path, fields: &[ast::StructField], ) -> Result, Error> { - let let_values: Vec> = (0 .. fields.len()) + let let_values: Vec<_> = (0 .. fields.len()) .map(|i| { let name = builder.id(format!("__field{}", i)); quote_stmt!(cx, @@ -920,7 +920,7 @@ fn deserialize_struct_visitor( struct_path: ast::Path, fields: &[ast::StructField], container_attrs: &attr::ContainerAttrs, -) -> Result<(Vec>, P, P), Error> { +) -> Result<(Vec>, ast::Stmt, P), Error> { let field_visitor = deserialize_field_visitor( cx, builder, @@ -977,7 +977,7 @@ fn deserialize_map( .collect(); // Declare each field. - let let_values: Vec> = field_names.iter() + let let_values: Vec = field_names.iter() .map(|field_name| quote_stmt!(cx, let mut $field_name = None;).unwrap()) .collect(); diff --git a/serde_macros/Cargo.toml b/serde_macros/Cargo.toml index 5b02d7f3..7203cd87 100644 --- a/serde_macros/Cargo.toml +++ b/serde_macros/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "serde_macros" -version = "0.6.12" +version = "0.6.13" authors = ["Erick Tryzelaar "] license = "MIT/Apache-2.0" description = "Macros to auto-generate implementations for the serde framework" @@ -16,14 +16,14 @@ plugin = true nightly-testing = ["clippy", "serde/nightly-testing", "serde_codegen/nightly-testing"] [dependencies] -clippy = { version = "^0.0.39", optional = true } -serde_codegen = { version = "^0.6.12", path = "../serde_codegen", default-features = false, features = ["nightly"] } +clippy = { version = "^0.0.41", optional = true } +serde_codegen = { version = "^0.6.13", path = "../serde_codegen", default-features = false, features = ["nightly"] } [dev-dependencies] compiletest_rs = "^0.0.11" num = "^0.1.27" rustc-serialize = "^0.3.16" -serde = { version = "^0.6.12", path = "../serde", features = ["num-impls"] } +serde = { version = "^0.6.13", path = "../serde", features = ["num-impls"] } [[test]] name = "test" diff --git a/serde_tests/Cargo.toml b/serde_tests/Cargo.toml index 130d9dd4..a4ed74d9 100644 --- a/serde_tests/Cargo.toml +++ b/serde_tests/Cargo.toml @@ -14,18 +14,18 @@ build = "build.rs" nightly-testing = ["clippy", "serde/nightly-testing", "serde_codegen/nightly-testing"] [build-dependencies] -syntex = { version = "^0.27.0" } -syntex_syntax = { version = "^0.27.0" } -serde_codegen = { version = "^0.6.12", path = "../serde_codegen", features = ["with-syntex"] } +syntex = { version = "^0.28.0" } +syntex_syntax = { version = "^0.28.0" } +serde_codegen = { version = "^0.6.13", path = "../serde_codegen", features = ["with-syntex"] } [dev-dependencies] num = "^0.1.26" rustc-serialize = "^0.3.16" serde = { version = "*", path = "../serde", features = ["num-impls"] } -syntex = "^0.27.0" +syntex = "^0.28.0" [dependencies] -clippy = { version = "^0.0.39", optional = true } +clippy = { version = "^0.0.41", optional = true } [[test]] name = "test"