Merge pull request #373 from erickt/master

Updating to rustc 1.11.0-nightly (7d2f75a95 2016-06-09)
This commit is contained in:
Erick Tryzelaar 2016-06-11 09:09:22 -07:00 committed by GitHub
commit 7dfa8f43f4
4 changed files with 13 additions and 15 deletions

View File

@ -1,6 +1,6 @@
[package]
name = "serde_codegen"
version = "0.7.9"
version = "0.7.10"
authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
license = "MIT/Apache-2.0"
description = "Macros to auto-generate implementations for the serde framework"
@ -17,13 +17,13 @@ nightly-testing = ["clippy"]
with-syntex = ["quasi/with-syntex", "quasi_codegen", "quasi_codegen/with-syntex", "syntex", "syntex_syntax"]
[build-dependencies]
quasi_codegen = { version = "^0.11.0", optional = true }
quasi_codegen = { version = "^0.12.0", optional = true }
syntex = { version = "^0.33.0", optional = true }
[dependencies]
aster = { version = "^0.17.0", default-features = false }
aster = { version = "^0.18.0", default-features = false }
clippy = { version = "^0.*", optional = true }
quasi = { version = "^0.11.0", default-features = false }
quasi_macros = { version = "^0.11.0", optional = true }
syntex = { version = "^0.33.0", optional = true }
syntex_syntax = { version = "^0.33.0", optional = true }
quasi = { version = "^0.12.0", default-features = false }
quasi_macros = { version = "^0.12.0", optional = true }
syntex = { version = "^0.35.0", optional = true }
syntex_syntax = { version = "^0.35.0", optional = true }

View File

@ -8,13 +8,11 @@ mod inner {
pub fn main() {
let out_dir = env::var_os("OUT_DIR").unwrap();
let mut registry = syntex::Registry::new();
quasi_codegen::register(&mut registry);
let src = Path::new("src/lib.rs.in");
let dst = Path::new(&out_dir).join("lib.rs");
registry.expand("", &src, &dst).unwrap();
quasi_codegen::expand(&src, &dst).unwrap();
}
}

View File

@ -18,7 +18,7 @@ nightly-testing = ["clippy", "serde/nightly-testing", "serde_codegen/nightly-tes
[dependencies]
clippy = { version = "^0.*", optional = true }
serde_codegen = { version = "^0.7.9", path = "../serde_codegen", default-features = false, features = ["nightly"] }
serde_codegen = { version = "^0.7.10", path = "../serde_codegen", default-features = false, features = ["nightly"] }
[dev-dependencies]
compiletest_rs = "^0.1.1"

View File

@ -1,6 +1,6 @@
[package]
name = "serde_tests"
version = "0.7.9"
version = "0.7.10"
authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
license = "MIT/Apache-2.0"
description = "A generic serialization/deserialization framework"
@ -14,14 +14,14 @@ build = "build.rs"
nightly-testing = ["clippy", "serde/nightly-testing", "serde_codegen/nightly-testing"]
[build-dependencies]
syntex = { version = "^0.33.0" }
syntex_syntax = { version = "^0.33.0" }
syntex = { version = "^0.35.0" }
syntex_syntax = { version = "^0.35.0" }
serde_codegen = { version = "*", path = "../serde_codegen", features = ["with-syntex"] }
[dev-dependencies]
rustc-serialize = "^0.3.16"
serde = { version = "*", path = "../serde" }
syntex = "^0.33.0"
syntex = "^0.35.0"
[dependencies]
clippy = { version = "^0.*", optional = true }