From 0ff91e44513c78d5ff8a26e24468ae4127f24d2a Mon Sep 17 00:00:00 2001 From: Olaf Buddenhagen Date: Mon, 2 May 2016 07:08:43 +0200 Subject: [PATCH 1/3] Adapt for removal of old interfaces in libsyntax https://github.com/rust-lang/rust/commit/9108fb7bae11f18715d971eeae1e5ca84662e1ee dropped the `map()` method (among other things) -- so we need to adapt our code. This change should be backwards-compatible. --- serde_codegen/src/bound.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/serde_codegen/src/bound.rs b/serde_codegen/src/bound.rs index ad973302..27b208b1 100644 --- a/serde_codegen/src/bound.rs +++ b/serde_codegen/src/bound.rs @@ -12,11 +12,11 @@ use syntax::visit; // allowed here". pub fn without_defaults(generics: &ast::Generics) -> ast::Generics { ast::Generics { - ty_params: generics.ty_params.map(|ty_param| { + ty_params: generics.ty_params.iter().map(|ty_param| { ast::TyParam { default: None, .. ty_param.clone() - }}), + }}).collect(), .. generics.clone() } } From 6e7a75c8590d1859dd005a3a2f55b356d4a82fec Mon Sep 17 00:00:00 2001 From: Olaf Buddenhagen Date: Mon, 2 May 2016 07:12:05 +0200 Subject: [PATCH 2/3] Adapt for `parser::PathParsingMode` interface change in libsyntax This was renamed upstream in https://github.com/rust-lang/rust/commit/6c44bea64435fd3859439a6ecab7758855a13f07 It's an incompatible change requiring new versions of syntex, aster, and quasi. --- serde_codegen/Cargo.toml | 12 ++++++------ serde_codegen/src/attr.rs | 4 ++-- serde_tests/Cargo.toml | 6 +++--- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/serde_codegen/Cargo.toml b/serde_codegen/Cargo.toml index 17df773f..241f3261 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.9.0", optional = true } +quasi_codegen = { version = "^0.10.0", optional = true } syntex = { version = "^0.31.0", optional = true } [dependencies] -aster = { version = "^0.15.0", default-features = false } +aster = { version = "^0.16.0", default-features = false } clippy = { version = "^0.*", optional = true } -quasi = { version = "^0.9.0", default-features = false } -quasi_macros = { version = "^0.9.0", optional = true } -syntex = { version = "^0.31.0", optional = true } -syntex_syntax = { version = "^0.31.0", optional = true } +quasi = { version = "^0.10.0", default-features = false } +quasi_macros = { version = "^0.10.0", optional = true } +syntex = { version = "^0.32.0", optional = true } +syntex_syntax = { version = "^0.32.0", optional = true } diff --git a/serde_codegen/src/attr.rs b/serde_codegen/src/attr.rs index 10f2068c..3ff3edf6 100644 --- a/serde_codegen/src/attr.rs +++ b/serde_codegen/src/attr.rs @@ -4,7 +4,7 @@ use syntax::attr; use syntax::codemap::Span; use syntax::ext::base::ExtCtxt; use syntax::fold::Folder; -use syntax::parse::parser::PathParsingMode; +use syntax::parse::parser::PathStyle; use syntax::parse::token::{self, InternedString}; use syntax::parse; use syntax::print::pprust::{lit_to_string, meta_item_to_string}; @@ -488,7 +488,7 @@ fn parse_lit_into_path(cx: &ExtCtxt, name: &str, lit: &ast::Lit) -> Result path, Err(mut e) => { e.emit(); diff --git a/serde_tests/Cargo.toml b/serde_tests/Cargo.toml index 54418208..16d68e64 100644 --- a/serde_tests/Cargo.toml +++ b/serde_tests/Cargo.toml @@ -14,14 +14,14 @@ build = "build.rs" nightly-testing = ["clippy", "serde/nightly-testing", "serde_codegen/nightly-testing"] [build-dependencies] -syntex = { version = "^0.31.0" } -syntex_syntax = { version = "^0.31.0" } +syntex = { version = "^0.32.0" } +syntex_syntax = { version = "^0.32.0" } serde_codegen = { version = "*", path = "../serde_codegen", features = ["with-syntex"] } [dev-dependencies] rustc-serialize = "^0.3.16" serde = { version = "*", path = "../serde" } -syntex = "^0.31.0" +syntex = "^0.32.0" [dependencies] clippy = { version = "^0.*", optional = true } From 0e9d45da601a94f60e76a3f1496f2203567db8be Mon Sep 17 00:00:00 2001 From: Olaf Buddenhagen Date: Mon, 2 May 2016 07:26:16 +0200 Subject: [PATCH 3/3] Bump version to 0.7.4 Dependencies were updated in previous commit. (For supporting current Nightly Rust.) I guess this shouldn't affect our client interface -- which is why these dependency bumps only get patch level version number updates for Serde, I presume? --- serde/Cargo.toml | 2 +- serde_codegen/Cargo.toml | 2 +- serde_macros/Cargo.toml | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/serde/Cargo.toml b/serde/Cargo.toml index 7a60cbfb..cbdfbd5e 100644 --- a/serde/Cargo.toml +++ b/serde/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "serde" -version = "0.7.3" +version = "0.7.4" 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 241f3261..f942707d 100644 --- a/serde_codegen/Cargo.toml +++ b/serde_codegen/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "serde_codegen" -version = "0.7.3" +version = "0.7.4" 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 dc6e84ad..10da3a45 100644 --- a/serde_macros/Cargo.toml +++ b/serde_macros/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "serde_macros" -version = "0.7.3" +version = "0.7.4" authors = ["Erick Tryzelaar "] license = "MIT/Apache-2.0" description = "Macros to auto-generate implementations for the serde framework" @@ -17,12 +17,12 @@ nightly-testing = ["clippy", "serde/nightly-testing", "serde_codegen/nightly-tes [dependencies] clippy = { version = "^0.*", optional = true } -serde_codegen = { version = "^0.7.3", path = "../serde_codegen", default-features = false, features = ["nightly"] } +serde_codegen = { version = "^0.7.4", path = "../serde_codegen", default-features = false, features = ["nightly"] } [dev-dependencies] compiletest_rs = "^0.1.1" rustc-serialize = "^0.3.16" -serde = { version = "^0.7.3", path = "../serde" } +serde = { version = "^0.7.4", path = "../serde" } [[test]] name = "test"