From 1796536962f6a2ce102b1b29cbc6a3f4f8a21c0d Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Wed, 17 Aug 2016 15:59:23 -0400 Subject: [PATCH 1/3] Update syntex to 0.41 --- examples/serde-syntex-example/Cargo.toml | 4 ++-- serde/Cargo.toml | 2 +- serde_codegen/Cargo.toml | 18 +++++++++--------- serde_codegen_internals/Cargo.toml | 6 +++--- serde_macros/Cargo.toml | 8 ++++---- serde_test/Cargo.toml | 4 ++-- testing/Cargo.toml | 2 +- 7 files changed, 22 insertions(+), 22 deletions(-) diff --git a/examples/serde-syntex-example/Cargo.toml b/examples/serde-syntex-example/Cargo.toml index b1b89cd3..97de0a37 100644 --- a/examples/serde-syntex-example/Cargo.toml +++ b/examples/serde-syntex-example/Cargo.toml @@ -9,9 +9,9 @@ default = ["serde_codegen"] unstable = ["serde_macros"] [build-dependencies] -serde_codegen = { version = "^0.8", optional = true } +serde_codegen = { version = "^0.8", optional = true, path = "../../serde_codegen" } [dependencies] serde = "^0.8" serde_json = "^0.8" -serde_macros = { version = "^0.8", optional = true } +serde_macros = { version = "^0.8", optional = true, path = "../../serde_macros" } diff --git a/serde/Cargo.toml b/serde/Cargo.toml index dba248ec..18716d59 100644 --- a/serde/Cargo.toml +++ b/serde/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "serde" -version = "0.8.1" +version = "0.8.2" authors = ["Erick Tryzelaar "] license = "MIT/Apache-2.0" description = "A generic serialization/deserialization framework" diff --git a/serde_codegen/Cargo.toml b/serde_codegen/Cargo.toml index 87ee6b94..bcccb180 100644 --- a/serde_codegen/Cargo.toml +++ b/serde_codegen/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "serde_codegen" -version = "0.8.1" +version = "0.8.2" authors = ["Erick Tryzelaar "] license = "MIT/Apache-2.0" description = "Macros to auto-generate implementations for the serde framework" @@ -24,14 +24,14 @@ with-syntex = [ ] [build-dependencies] -quasi_codegen = { version = "^0.16.0", optional = true } -syntex = { version = "^0.39.0", optional = true } +quasi_codegen = { version = "^0.17.0", optional = true } +syntex = { version = "^0.41.0", optional = true } [dependencies] -aster = { version = "^0.22.0", default-features = false } +aster = { version = "^0.24.0", default-features = false } clippy = { version = "^0.*", optional = true } -quasi = { version = "^0.16.0", default-features = false } -quasi_macros = { version = "^0.16.0", optional = true } -serde_codegen_internals = { version = "=0.5.0", default-features = false, path = "../serde_codegen_internals" } -syntex = { version = "^0.39.0", optional = true } -syntex_syntax = { version = "^0.39.0", optional = true } +quasi = { version = "^0.17.0", default-features = false } +quasi_macros = { version = "^0.17.0", optional = true } +serde_codegen_internals = { version = "=0.6.0", default-features = false, path = "../serde_codegen_internals" } +syntex = { version = "^0.41.0", optional = true } +syntex_syntax = { version = "^0.41.0", optional = true } diff --git a/serde_codegen_internals/Cargo.toml b/serde_codegen_internals/Cargo.toml index d588dfd7..eeb68ee6 100644 --- a/serde_codegen_internals/Cargo.toml +++ b/serde_codegen_internals/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "serde_codegen_internals" -version = "0.5.0" +version = "0.6.0" authors = ["Erick Tryzelaar "] license = "MIT/Apache-2.0" description = "AST representation used by Serde codegen. Unstable." @@ -16,5 +16,5 @@ with-syntex = ["syntex_syntax", "syntex_errors"] [dependencies] clippy = { version = "^0.*", optional = true } -syntex_syntax = { version = "^0.39.0", optional = true } -syntex_errors = { version = "^0.39.0", optional = true } +syntex_syntax = { version = "^0.41.0", optional = true } +syntex_errors = { version = "^0.41.0", optional = true } diff --git a/serde_macros/Cargo.toml b/serde_macros/Cargo.toml index 1c893292..afcaf4e3 100644 --- a/serde_macros/Cargo.toml +++ b/serde_macros/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "serde_macros" -version = "0.8.1" +version = "0.8.2" authors = ["Erick Tryzelaar "] license = "MIT/Apache-2.0" description = "Macros to auto-generate implementations for the serde framework" @@ -28,7 +28,7 @@ skeptic = { version = "^0.6.0", optional = true } [dependencies] clippy = { version = "^0.*", optional = true } -serde_codegen = { version = "=0.8.1", default-features = false, features = ["unstable"], path = "../serde_codegen" } +serde_codegen = { version = "=0.8.2", default-features = false, features = ["unstable"], path = "../serde_codegen" } skeptic = { version = "^0.6.0", optional = true } serde_json = { version = "0.8.0", optional = true } @@ -37,8 +37,8 @@ clippy = "^0.*" compiletest_rs = "^0.2.0" fnv = "1.0" rustc-serialize = "^0.3.16" -serde = { version = "0.8.1", path = "../serde" } -serde_test = { version = "0.8.1", path = "../serde_test" } +serde = { version = "0.8.2", path = "../serde" } +serde_test = { version = "0.8.2", path = "../serde_test" } [[test]] name = "test" diff --git a/serde_test/Cargo.toml b/serde_test/Cargo.toml index e29783e1..0d2e71e6 100644 --- a/serde_test/Cargo.toml +++ b/serde_test/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "serde_test" -version = "0.8.1" +version = "0.8.2" authors = ["Erick Tryzelaar "] license = "MIT/Apache-2.0" description = "Token De/Serializer for testing De/Serialize implementations" @@ -11,4 +11,4 @@ keywords = ["serde", "serialization"] include = ["Cargo.toml", "src/**/*.rs"] [dependencies] -serde = { version = "0.8.1", path = "../serde" } +serde = { version = "0.8.2", path = "../serde" } diff --git a/testing/Cargo.toml b/testing/Cargo.toml index fc68f4fb..9dd8790f 100644 --- a/testing/Cargo.toml +++ b/testing/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "serde_testing" -version = "0.8.1" +version = "0.8.2" authors = ["Erick Tryzelaar "] license = "MIT/Apache-2.0" description = "A generic serialization/deserialization framework" From 2bc1d62e50b799e06b51742a8490b546395e04ec Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Thu, 18 Aug 2016 14:05:06 -0400 Subject: [PATCH 2/3] Disable clippy until Manishearth/rust-clippy#1174 is fixed --- serde/Cargo.toml | 2 +- serde_codegen/Cargo.toml | 2 +- serde_codegen_internals/Cargo.toml | 2 +- serde_macros/Cargo.toml | 2 -- serde_macros/tests/run-pass/identity-op.rs | 2 +- testing/Cargo.toml | 2 +- 6 files changed, 5 insertions(+), 7 deletions(-) diff --git a/serde/Cargo.toml b/serde/Cargo.toml index 18716d59..c36f771d 100644 --- a/serde/Cargo.toml +++ b/serde/Cargo.toml @@ -17,7 +17,7 @@ std = [] unstable = [] alloc = ["unstable"] collections = ["alloc"] -unstable-testing = ["clippy", "unstable", "std"] +unstable-testing = ["unstable", "std"] [dependencies] clippy = { version = "^0.*", optional = true } diff --git a/serde_codegen/Cargo.toml b/serde_codegen/Cargo.toml index bcccb180..d247728a 100644 --- a/serde_codegen/Cargo.toml +++ b/serde_codegen/Cargo.toml @@ -13,7 +13,7 @@ include = ["Cargo.toml", "build.rs", "src/**/*.rs", "src/lib.rs.in"] [features] default = ["with-syntex"] unstable = ["quasi_macros"] -unstable-testing = ["clippy"] +unstable-testing = [] with-syntex = [ "quasi/with-syntex", "quasi_codegen", diff --git a/serde_codegen_internals/Cargo.toml b/serde_codegen_internals/Cargo.toml index eeb68ee6..92dba2db 100644 --- a/serde_codegen_internals/Cargo.toml +++ b/serde_codegen_internals/Cargo.toml @@ -11,7 +11,7 @@ include = ["Cargo.toml", "src/**/*.rs"] [features] default = ["with-syntex"] -unstable-testing = ["clippy"] +unstable-testing = [] with-syntex = ["syntex_syntax", "syntex_errors"] [dependencies] diff --git a/serde_macros/Cargo.toml b/serde_macros/Cargo.toml index afcaf4e3..d43b44c4 100644 --- a/serde_macros/Cargo.toml +++ b/serde_macros/Cargo.toml @@ -16,7 +16,6 @@ plugin = true [features] unstable-testing = [ - "clippy", "skeptic", "serde_json", "serde/unstable-testing", @@ -33,7 +32,6 @@ skeptic = { version = "^0.6.0", optional = true } serde_json = { version = "0.8.0", optional = true } [dev-dependencies] -clippy = "^0.*" compiletest_rs = "^0.2.0" fnv = "1.0" rustc-serialize = "^0.3.16" diff --git a/serde_macros/tests/run-pass/identity-op.rs b/serde_macros/tests/run-pass/identity-op.rs index dcf8117a..a82f100d 100644 --- a/serde_macros/tests/run-pass/identity-op.rs +++ b/serde_macros/tests/run-pass/identity-op.rs @@ -1,5 +1,5 @@ #![feature(custom_derive, plugin)] -#![plugin(serde_macros, clippy)] +#![plugin(serde_macros)] #![deny(identity_op)] diff --git a/testing/Cargo.toml b/testing/Cargo.toml index 9dd8790f..c80cac39 100644 --- a/testing/Cargo.toml +++ b/testing/Cargo.toml @@ -11,7 +11,7 @@ keywords = ["serialization"] build = "build.rs" [features] -unstable-testing = ["clippy", "serde/unstable-testing", "serde_codegen/unstable-testing"] +unstable-testing = ["serde/unstable-testing", "serde_codegen/unstable-testing"] [build-dependencies] serde_codegen = { path = "../serde_codegen", features = ["with-syntex"] } From 671f5ebd07f1d1761133405dd25ff2104a1d507a Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Thu, 18 Aug 2016 15:01:13 -0400 Subject: [PATCH 3/3] Path override to prevent compiletest from seeing 2 versions of serde --- serde_macros/.cargo/config | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 serde_macros/.cargo/config diff --git a/serde_macros/.cargo/config b/serde_macros/.cargo/config new file mode 100644 index 00000000..7f1ab8d3 --- /dev/null +++ b/serde_macros/.cargo/config @@ -0,0 +1,2 @@ +# To prevent compiletest from seeing two versions of serde +paths = ["../serde"]