From 74b230c183ff5659454249dde37500811fd413f9 Mon Sep 17 00:00:00 2001 From: debris Date: Sun, 14 Feb 2016 03:19:15 +0100 Subject: [PATCH 1/4] Update serde_codegen for rustc 1.8.0-nightly (ce4b75f25 2016-02-12) --- serde_codegen/Cargo.toml | 16 ++++++++-------- serde_codegen/src/de.rs | 10 +++++----- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/serde_codegen/Cargo.toml b/serde_codegen/Cargo.toml index 46b3ec8a..76a73e96 100644 --- a/serde_codegen/Cargo.toml +++ b/serde_codegen/Cargo.toml @@ -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 e1a2c0e1..8b37cff0 100644 --- a/serde_codegen/src/de.rs +++ b/serde_codegen/src/de.rs @@ -393,7 +393,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, @@ -427,7 +427,7 @@ fn deserialize_struct_as_seq( struct_path: ast::Path, fields: &[ast::StructField], ) -> Result, ()> { - 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, @@ -930,7 +930,7 @@ fn deserialize_struct_visitor( builder: &aster::AstBuilder, struct_path: ast::Path, fields: &[ast::StructField], -) -> Result<(Vec>, P, P), ()> { +) -> Result<(Vec>, ast::Stmt, P), ()> { 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(); @@ -994,7 +994,7 @@ fn deserialize_map( let field_attrs = try!(field::struct_field_attrs(cx, builder, fields)); - let extract_values: Vec> = field_names.iter() + let extract_values: Vec = field_names.iter() .zip(field_attrs.iter()) .map(|(field_name, field_attr)| { let missing_expr = if field_attr.use_default() { From b63cc13f3a05ee116139a044003cade2991726c5 Mon Sep 17 00:00:00 2001 From: debris Date: Sun, 14 Feb 2016 03:33:58 +0100 Subject: [PATCH 2/4] updated clippy to 0.0.41 --- serde/Cargo.toml | 2 +- serde_macros/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/serde/Cargo.toml b/serde/Cargo.toml index 125f4196..f3556edb 100644 --- a/serde/Cargo.toml +++ b/serde/Cargo.toml @@ -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_macros/Cargo.toml b/serde_macros/Cargo.toml index 5b02d7f3..5390837e 100644 --- a/serde_macros/Cargo.toml +++ b/serde_macros/Cargo.toml @@ -16,7 +16,7 @@ plugin = true nightly-testing = ["clippy", "serde/nightly-testing", "serde_codegen/nightly-testing"] [dependencies] -clippy = { version = "^0.0.39", optional = true } +clippy = { version = "^0.0.41", optional = true } serde_codegen = { version = "^0.6.12", path = "../serde_codegen", default-features = false, features = ["nightly"] } [dev-dependencies] From e18416ac7f6dfcf2b5477c64aa185655fd9b957b Mon Sep 17 00:00:00 2001 From: debris Date: Sun, 14 Feb 2016 03:43:37 +0100 Subject: [PATCH 3/4] updated serde_tests deps --- serde_tests/Cargo.toml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/serde_tests/Cargo.toml b/serde_tests/Cargo.toml index 130d9dd4..d58d5e70 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" } +syntex = { version = "^0.28.0" } +syntex_syntax = { version = "^0.28.0" } serde_codegen = { version = "^0.6.12", 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" From fd5ab8c5c8bfb6f0a7fa1aaa4235bb09d13f8db7 Mon Sep 17 00:00:00 2001 From: Erick Tryzelaar Date: Sat, 13 Feb 2016 22:06:08 -0800 Subject: [PATCH 4/4] feat(cargo): Version bump --- serde/Cargo.toml | 2 +- serde_codegen/Cargo.toml | 2 +- serde_macros/Cargo.toml | 6 +++--- serde_tests/Cargo.toml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/serde/Cargo.toml b/serde/Cargo.toml index f3556edb..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" diff --git a/serde_codegen/Cargo.toml b/serde_codegen/Cargo.toml index 76a73e96..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" diff --git a/serde_macros/Cargo.toml b/serde_macros/Cargo.toml index 5390837e..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" @@ -17,13 +17,13 @@ nightly-testing = ["clippy", "serde/nightly-testing", "serde_codegen/nightly-tes [dependencies] clippy = { version = "^0.0.41", optional = true } -serde_codegen = { version = "^0.6.12", path = "../serde_codegen", default-features = false, features = ["nightly"] } +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 d58d5e70..a4ed74d9 100644 --- a/serde_tests/Cargo.toml +++ b/serde_tests/Cargo.toml @@ -16,7 +16,7 @@ nightly-testing = ["clippy", "serde/nightly-testing", "serde_codegen/nightly-tes [build-dependencies] syntex = { version = "^0.28.0" } syntex_syntax = { version = "^0.28.0" } -serde_codegen = { version = "^0.6.12", path = "../serde_codegen", features = ["with-syntex"] } +serde_codegen = { version = "^0.6.13", path = "../serde_codegen", features = ["with-syntex"] } [dev-dependencies] num = "^0.1.26"