Skip to content

Commit

Permalink
feat(cargo): Update syntex
Browse files Browse the repository at this point in the history
  • Loading branch information
erickt committed Mar 17, 2016
1 parent b1cab41 commit 9785646
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 15 deletions.
16 changes: 8 additions & 8 deletions serde_codegen/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "serde_codegen"
version = "0.7.0"
version = "0.7.1"
authors = ["Erick Tryzelaar <[email protected]>"]
license = "MIT/Apache-2.0"
description = "Macros to auto-generate implementations for the serde framework"
Expand All @@ -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.7.0", optional = true }
syntex = { version = "^0.29.0", optional = true }
quasi_codegen = { version = "^0.8.0", optional = true }
syntex = { version = "^0.30.0", optional = true }

[dependencies]
aster = { version = "^0.13.1", default-features = false }
aster = { version = "^0.14.0", default-features = false }
clippy = { version = "^0.*", optional = true }
quasi = { version = "^0.7.0", default-features = false }
quasi_macros = { version = "^0.7.0", optional = true }
syntex = { version = "^0.29.0", optional = true }
syntex_syntax = { version = "^0.29.0", optional = true }
quasi = { version = "^0.8.0", default-features = false }
quasi_macros = { version = "^0.8.0", optional = true }
syntex = { version = "^0.30.0", optional = true }
syntex_syntax = { version = "^0.30.0", optional = true }
4 changes: 2 additions & 2 deletions serde_codegen/src/attr.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
// spans to say they're coming from a macro context that originally came from the attribute,
// 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),
(*source).to_owned(),
cx.cfg(),
cx.parse_sess());
cx.parse_sess()));

// Respan the spans to say they are all coming from this macro.
let tts = Respanner { cx: cx }.fold_tts(&tts);
Expand Down
2 changes: 2 additions & 0 deletions serde_codegen/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,11 @@ extern crate quasi;
extern crate syntex;

#[cfg(feature = "with-syntex")]
#[macro_use]
extern crate syntex_syntax as syntax;

#[cfg(not(feature = "with-syntex"))]
#[macro_use]
extern crate syntax;

#[cfg(not(feature = "with-syntex"))]
Expand Down
2 changes: 1 addition & 1 deletion serde_macros/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ clippy = { version = "^0.*", optional = true }
serde_codegen = { version = "^0.7.0", path = "../serde_codegen", default-features = false, features = ["nightly"] }

[dev-dependencies]
compiletest_rs = "^0.0.11"
compiletest_rs = "^0.1.1"
rustc-serialize = "^0.3.16"
serde = { version = "^0.7.0", path = "../serde" }

Expand Down
8 changes: 4 additions & 4 deletions serde_tests/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "serde_tests"
version = "0.6.3"
version = "0.7.1"
authors = ["Erick Tryzelaar <[email protected]>"]
license = "MIT/Apache-2.0"
description = "A generic serialization/deserialization framework"
Expand All @@ -14,14 +14,14 @@ build = "build.rs"
nightly-testing = ["clippy", "serde/nightly-testing", "serde_codegen/nightly-testing"]

[build-dependencies]
syntex = { version = "^0.29.0" }
syntex_syntax = { version = "^0.29.0" }
syntex = { version = "^0.30.0" }
syntex_syntax = { version = "^0.30.0" }
serde_codegen = { version = "*", path = "../serde_codegen", features = ["with-syntex"] }

[dev-dependencies]
rustc-serialize = "^0.3.16"
serde = { version = "*", path = "../serde" }
syntex = "^0.29.0"
syntex = "^0.30.0"

[dependencies]
clippy = { version = "^0.*", optional = true }
Expand Down

0 comments on commit 9785646

Please sign in to comment.