Merge pull request #303 from antrik/rustup

Update for latest libsyntax changes

Author: erickt

serde/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "serde"
-version = "0.7.3"
+version = "0.7.4"
 authors = ["Erick Tryzelaar <[email protected]>"]
 license = "MIT/Apache-2.0"
 description = "A generic serialization/deserialization framework"

serde_codegen/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "serde_codegen"
-version = "0.7.3"
+version = "0.7.4"
 authors = ["Erick Tryzelaar <[email protected]>"]
 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.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 }

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<ast::
 
     let mut parser = parse::new_parser_from_tts(cx.parse_sess(), cx.cfg(), tts);
 
-    let path = match parser.parse_path(PathParsingMode::LifetimeAndTypesWithoutColons) {
+    let path = match parser.parse_path(PathStyle::Type) {
         Ok(path) => path,
         Err(mut e) => {
             e.emit();

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()
     }
 }

serde_macros/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "serde_macros"
-version = "0.7.3"
+version = "0.7.4"
 authors = ["Erick Tryzelaar <[email protected]>"]
 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"

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 }