itsscb/serde
1
0
Fork 0
mirror of https://github.com/serde-rs/serde.git synced 2025-10-02 15:25:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(cargo): Update syntex

Browse Source
This commit is contained in:
Erick Tryzelaar 2016-03-16 23:33:23 -07:00
parent b1cab411d6
commit 9785646246
5 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
serde_codegen/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "serde_codegen" name = "serde_codegen"
version = "0.7.0" version = "0.7.1"
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.7.0", optional = true } quasi_codegen = { version = "^0.8.0", optional = true }
syntex = { version = "^0.29.0", optional = true } syntex = { version = "^0.30.0", optional = true }
[dependencies] [dependencies]
aster = { version = "^0.13.1", default-features = false } aster = { version = "^0.14.0", default-features = false }
clippy = { version = "^0.*", optional = true } clippy = { version = "^0.*", optional = true }
quasi = { version = "^0.7.0", default-features = false } quasi = { version = "^0.8.0", default-features = false }
quasi_macros = { version = "^0.7.0", optional = true } quasi_macros = { version = "^0.8.0", optional = true }
syntex = { version = "^0.29.0", optional = true } syntex = { version = "^0.30.0", optional = true }
syntex_syntax = { version = "^0.29.0", optional = true } syntex_syntax = { version = "^0.30.0", optional = true }

4
serde_codegen/src/attr.rs
View File

@ -462,11 +462,11 @@ fn parse_lit_into_path(cx: &ExtCtxt, name: &str, lit: &ast::Lit) -> Result<ast::
// error reporting, we'll first parse the string into a token tree. Then we'll update those // error reporting, we'll first parse the string into a token tree. Then we'll update those
// spans to say they're coming from a macro context that originally came from the attribute, // spans to say they're coming from a macro context that originally came from the attribute,
// and then finally parse them into an expression. // and then finally parse them into an expression.
let tts = parse::parse_tts_from_source_str( let tts = panictry!(parse::parse_tts_from_source_str(
format!("<serde {} expansion>", name), format!("<serde {} expansion>", name),
(*source).to_owned(), (*source).to_owned(),
cx.cfg(), cx.cfg(),
cx.parse_sess()); cx.parse_sess()));
// Respan the spans to say they are all coming from this macro. // Respan the spans to say they are all coming from this macro.
let tts = Respanner { cx: cx }.fold_tts(&tts); let tts = Respanner { cx: cx }.fold_tts(&tts);

2
serde_codegen/src/lib.rs
View File

@ -11,9 +11,11 @@ extern crate quasi;
extern crate syntex; extern crate syntex;
#[cfg(feature = "with-syntex")] #[cfg(feature = "with-syntex")]
#[macro_use]
extern crate syntex_syntax as syntax; extern crate syntex_syntax as syntax;
#[cfg(not(feature = "with-syntex"))] #[cfg(not(feature = "with-syntex"))]
#[macro_use]
extern crate syntax; extern crate syntax;
#[cfg(not(feature = "with-syntex"))] #[cfg(not(feature = "with-syntex"))]

2
serde_macros/Cargo.toml
View File

@ -20,7 +20,7 @@ clippy = { version = "^0.*", optional = true }
serde_codegen = { version = "^0.7.0", path = "../serde_codegen", default-features = false, features = ["nightly"] } serde_codegen = { version = "^0.7.0", path = "../serde_codegen", default-features = false, features = ["nightly"] }
[dev-dependencies] [dev-dependencies]
compiletest_rs = "^0.0.11" compiletest_rs = "^0.1.1"
rustc-serialize = "^0.3.16" rustc-serialize = "^0.3.16"
serde = { version = "^0.7.0", path = "../serde" } serde = { version = "^0.7.0", path = "../serde" }

8
serde_tests/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "serde_tests" name = "serde_tests"
version = "0.6.3" version = "0.7.1"
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,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.29.0" } syntex = { version = "^0.30.0" }
syntex_syntax = { version = "^0.29.0" } syntex_syntax = { version = "^0.30.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.29.0" syntex = "^0.30.0"
[dependencies] [dependencies]
clippy = { version = "^0.*", optional = true } clippy = { version = "^0.*", optional = true }