mikros/serde
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #303 from antrik/rustup

Browse Source 
Update for latest libsyntax changes
This commit is contained in:
Erick Tryzelaar 2016-05-03 22:07:38 -07:00
commit 8378267b9b
6 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
serde/Cargo.toml
View File

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

14
serde_codegen/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "serde_codegen" name = "serde_codegen"
version = "0.7.3" version = "0.7.4"
authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"] authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
license = "MIT/Apache-2.0" license = "MIT/Apache-2.0"
description = "Macros to auto-generate implementations for the serde framework" 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"] with-syntex = ["quasi/with-syntex", "quasi_codegen", "quasi_codegen/with-syntex", "syntex", "syntex_syntax"]
[build-dependencies] [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 } syntex = { version = "^0.31.0", optional = true }
[dependencies] [dependencies]
aster = { version = "^0.15.0", default-features = false } aster = { version = "^0.16.0", default-features = false }
clippy = { version = "^0.*", optional = true } clippy = { version = "^0.*", optional = true }
quasi = { version = "^0.9.0", default-features = false } quasi = { version = "^0.10.0", default-features = false }
quasi_macros = { version = "^0.9.0", optional = true } quasi_macros = { version = "^0.10.0", optional = true }
syntex = { version = "^0.31.0", optional = true } syntex = { version = "^0.32.0", optional = true }
syntex_syntax = { version = "^0.31.0", optional = true } syntex_syntax = { version = "^0.32.0", optional = true }

4
serde_codegen/src/attr.rs
View File

@ -4,7 +4,7 @@ use syntax::attr;
use syntax::codemap::Span; use syntax::codemap::Span;
use syntax::ext::base::ExtCtxt; use syntax::ext::base::ExtCtxt;
use syntax::fold::Folder; use syntax::fold::Folder;
use syntax::parse::parser::PathParsingMode; use syntax::parse::parser::PathStyle;
use syntax::parse::token::{self, InternedString}; use syntax::parse::token::{self, InternedString};
use syntax::parse; use syntax::parse;
use syntax::print::pprust::{lit_to_string, meta_item_to_string}; 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 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, Ok(path) => path,
Err(mut e) => { Err(mut e) => {
e.emit(); e.emit();

4
serde_codegen/src/bound.rs
View File

@ -12,11 +12,11 @@ use syntax::visit;
// allowed here". // allowed here".
pub fn without_defaults(generics: &ast::Generics) -> ast::Generics { pub fn without_defaults(generics: &ast::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 { ast::TyParam {
default: None, default: None,
.. ty_param.clone() .. ty_param.clone()
}}), }}).collect(),
.. generics.clone() .. generics.clone()
} }
} }

6
serde_macros/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "serde_macros" name = "serde_macros"
version = "0.7.3" version = "0.7.4"
authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"] authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
license = "MIT/Apache-2.0" license = "MIT/Apache-2.0"
description = "Macros to auto-generate implementations for the serde framework" 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] [dependencies]
clippy = { version = "^0.*", optional = true } 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] [dev-dependencies]
compiletest_rs = "^0.1.1" compiletest_rs = "^0.1.1"
rustc-serialize = "^0.3.16" rustc-serialize = "^0.3.16"
serde = { version = "^0.7.3", path = "../serde" } serde = { version = "^0.7.4", path = "../serde" }
[[test]] [[test]]
name = "test" name = "test"

6
serde_tests/Cargo.toml
View File

@ -14,14 +14,14 @@ build = "build.rs"
nightly-testing = ["clippy", "serde/nightly-testing", "serde_codegen/nightly-testing"] nightly-testing = ["clippy", "serde/nightly-testing", "serde_codegen/nightly-testing"]
[build-dependencies] [build-dependencies]
syntex = { version = "^0.31.0" } syntex = { version = "^0.32.0" }
syntex_syntax = { version = "^0.31.0" } syntex_syntax = { version = "^0.32.0" }
serde_codegen = { version = "*", path = "../serde_codegen", features = ["with-syntex"] } serde_codegen = { version = "*", path = "../serde_codegen", features = ["with-syntex"] }
[dev-dependencies] [dev-dependencies]
rustc-serialize = "^0.3.16" rustc-serialize = "^0.3.16"
serde = { version = "*", path = "../serde" } serde = { version = "*", path = "../serde" }
syntex = "^0.31.0" syntex = "^0.32.0"
[dependencies] [dependencies]
clippy = { version = "^0.*", optional = true } clippy = { version = "^0.*", optional = true }