From f0659e10783cc81ba64095fbac9a53eb5da91716 Mon Sep 17 00:00:00 2001 From: Oliver Schneider Date: Fri, 15 Jul 2016 16:24:26 +0200 Subject: next iteration --- serde-tests/Cargo.toml | 1 - serde-tests/build.rs | 6 +----- 2 files changed, 1 insertion(+), 6 deletions(-) (limited to 'serde-tests') diff --git a/serde-tests/Cargo.toml b/serde-tests/Cargo.toml index 97d743a..aca29cb 100644 --- a/serde-tests/Cargo.toml +++ b/serde-tests/Cargo.toml @@ -9,7 +9,6 @@ serde = "0.7" toml = { path = "..", features = ["serde"] } [build-dependencies] -syntex = "0.33" serde_codegen = "0.7" [lib] diff --git a/serde-tests/build.rs b/serde-tests/build.rs index 7acbef5..1cc5062 100644 --- a/serde-tests/build.rs +++ b/serde-tests/build.rs @@ -1,4 +1,3 @@ -extern crate syntex; extern crate serde_codegen; use std::env; @@ -10,8 +9,5 @@ fn main() { let src = Path::new("test.rs.in"); let dst = Path::new(&out_dir).join("test.rs"); - let mut registry = syntex::Registry::new(); - - serde_codegen::register(&mut registry); - registry.expand("", &src, &dst).unwrap(); + serde_codegen::expand(&src, &dst).unwrap(); } -- cgit v1.2.3 From 673d4e14525d715b0d2c09a94cc21e63871e29db Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Fri, 29 Jul 2016 00:23:12 -0700 Subject: Bump serde dependency in serde-tests --- serde-tests/Cargo.lock | 93 ++++++++++++++++++++++++++++++++++---------------- serde-tests/Cargo.toml | 4 +-- 2 files changed, 66 insertions(+), 31 deletions(-) (limited to 'serde-tests') diff --git a/serde-tests/Cargo.lock b/serde-tests/Cargo.lock index 24d6462..a402684 100644 --- a/serde-tests/Cargo.lock +++ b/serde-tests/Cargo.lock @@ -2,18 +2,17 @@ name = "serde-tests" version = "0.1.0" dependencies = [ - "serde 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_codegen 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)", - "syntex 0.33.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_codegen 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "toml 0.1.30", ] [[package]] name = "aster" -version = "0.17.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "syntex_syntax 0.33.0 (registry+https://github.com/rust-lang/crates.io-index)", + "syntex_syntax 0.39.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -26,13 +25,13 @@ name = "kernel32-sys" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "winapi 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "libc" -version = "0.2.11" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -42,20 +41,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "quasi" -version = "0.11.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "syntex_syntax 0.33.0 (registry+https://github.com/rust-lang/crates.io-index)", + "syntex_errors 0.39.0 (registry+https://github.com/rust-lang/crates.io-index)", + "syntex_syntax 0.39.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "quasi_codegen" -version = "0.11.0" +version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "aster 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)", - "syntex 0.33.0 (registry+https://github.com/rust-lang/crates.io-index)", - "syntex_syntax 0.33.0 (registry+https://github.com/rust-lang/crates.io-index)", + "aster 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)", + "syntex 0.39.0 (registry+https://github.com/rust-lang/crates.io-index)", + "syntex_errors 0.39.0 (registry+https://github.com/rust-lang/crates.io-index)", + "syntex_syntax 0.39.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -65,49 +66,83 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "serde" -version = "0.7.6" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "serde_codegen" -version = "0.7.6" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "aster 0.17.0 (registry+https://github.com/rust-lang/crates.io-index)", - "quasi 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "quasi_codegen 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "syntex 0.33.0 (registry+https://github.com/rust-lang/crates.io-index)", - "syntex_syntax 0.33.0 (registry+https://github.com/rust-lang/crates.io-index)", + "aster 0.22.0 (registry+https://github.com/rust-lang/crates.io-index)", + "quasi 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", + "quasi_codegen 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_codegen_internals 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "syntex 0.39.0 (registry+https://github.com/rust-lang/crates.io-index)", + "syntex_syntax 0.39.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "serde_codegen_internals" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "syntex_errors 0.39.0 (registry+https://github.com/rust-lang/crates.io-index)", + "syntex_syntax 0.39.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "syntex" -version = "0.33.0" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "syntex_errors 0.39.0 (registry+https://github.com/rust-lang/crates.io-index)", + "syntex_syntax 0.39.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "syntex_errors" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "syntex_syntax 0.33.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", + "syntex_pos 0.39.0 (registry+https://github.com/rust-lang/crates.io-index)", + "term 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-xid 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "syntex_pos" +version = "0.39.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "syntex_syntax" -version = "0.33.0" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "term 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", + "syntex_errors 0.39.0 (registry+https://github.com/rust-lang/crates.io-index)", + "syntex_pos 0.39.0 (registry+https://github.com/rust-lang/crates.io-index)", + "term 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-xid 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "term" -version = "0.2.14" +version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -115,7 +150,7 @@ name = "toml" version = "0.1.30" dependencies = [ "rustc-serialize 0.3.19 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -125,7 +160,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "winapi" -version = "0.2.7" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] diff --git a/serde-tests/Cargo.toml b/serde-tests/Cargo.toml index aca29cb..a41747f 100644 --- a/serde-tests/Cargo.toml +++ b/serde-tests/Cargo.toml @@ -5,11 +5,11 @@ authors = ["Alex Crichton "] build = "build.rs" [dependencies] -serde = "0.7" +serde = "0.8" toml = { path = "..", features = ["serde"] } [build-dependencies] -serde_codegen = "0.7" +serde_codegen = "0.8" [lib] name = "serde_tests" -- cgit v1.2.3