mikros/serde
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch origin/master into origin/stack

Browse Source
This commit is contained in:
David Tolnay 2016-08-18 15:26:14 -04:00
commit 6f77ea58fd
No known key found for this signature in database
GPG Key ID: F9BA143B95FF6D82
9 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/serde-syntex-example/Cargo.toml
View File

@ -9,9 +9,9 @@ default = ["serde_codegen"]
unstable = ["serde_macros"] unstable = ["serde_macros"]
[build-dependencies] [build-dependencies]
serde_codegen = { version = "^0.8", optional = true } serde_codegen = { version = "^0.8", optional = true, path = "../../serde_codegen" }
[dependencies] [dependencies]
serde = "^0.8" serde = "^0.8"
serde_json = "^0.8" serde_json = "^0.8"
serde_macros = { version = "^0.8", optional = true } serde_macros = { version = "^0.8", optional = true, path = "../../serde_macros" }

4
serde/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "serde" name = "serde"
version = "0.8.1" version = "0.8.2"
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"
@ -17,7 +17,7 @@ std = []
unstable = [] unstable = []
alloc = ["unstable"] alloc = ["unstable"]
collections = ["alloc"] collections = ["alloc"]
unstable-testing = ["clippy", "unstable", "std"] unstable-testing = ["unstable", "std"]
[dependencies] [dependencies]
clippy = { version = "^0.*", optional = true } clippy = { version = "^0.*", optional = true }

20
serde_codegen/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "serde_codegen" name = "serde_codegen"
version = "0.8.1" version = "0.8.2"
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"
@ -13,7 +13,7 @@ include = ["Cargo.toml", "build.rs", "src/**/*.rs", "src/lib.rs.in"]
[features] [features]
default = ["with-syntex"] default = ["with-syntex"]
unstable = ["quasi_macros"] unstable = ["quasi_macros"]
unstable-testing = ["clippy"] unstable-testing = []
with-syntex = [ with-syntex = [
"quasi/with-syntex", "quasi/with-syntex",
"quasi_codegen", "quasi_codegen",
@ -24,14 +24,14 @@ with-syntex = [
] ]
[build-dependencies] [build-dependencies]
quasi_codegen = { version = "^0.16.0", optional = true } quasi_codegen = { version = "^0.17.0", optional = true }
syntex = { version = "^0.39.0", optional = true } syntex = { version = "^0.41.0", optional = true }
[dependencies] [dependencies]
aster = { version = "^0.22.0", default-features = false } aster = { version = "^0.24.0", default-features = false }
clippy = { version = "^0.*", optional = true } clippy = { version = "^0.*", optional = true }
quasi = { version = "^0.16.0", default-features = false } quasi = { version = "^0.17.0", default-features = false }
quasi_macros = { version = "^0.16.0", optional = true } quasi_macros = { version = "^0.17.0", optional = true }
serde_codegen_internals = { version = "=0.5.0", default-features = false, path = "../serde_codegen_internals" } serde_codegen_internals = { version = "=0.6.0", default-features = false, path = "../serde_codegen_internals" }
syntex = { version = "^0.39.0", optional = true } syntex = { version = "^0.41.0", optional = true }
syntex_syntax = { version = "^0.39.0", optional = true } syntex_syntax = { version = "^0.41.0", optional = true }

8
serde_codegen_internals/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "serde_codegen_internals" name = "serde_codegen_internals"
version = "0.5.0" version = "0.6.0"
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 = "AST representation used by Serde codegen. Unstable." description = "AST representation used by Serde codegen. Unstable."
@ -11,10 +11,10 @@ include = ["Cargo.toml", "src/**/*.rs"]
[features] [features]
default = ["with-syntex"] default = ["with-syntex"]
unstable-testing = ["clippy"] unstable-testing = []
with-syntex = ["syntex_syntax", "syntex_errors"] with-syntex = ["syntex_syntax", "syntex_errors"]
[dependencies] [dependencies]
clippy = { version = "^0.*", optional = true } clippy = { version = "^0.*", optional = true }
syntex_syntax = { version = "^0.39.0", optional = true } syntex_syntax = { version = "^0.41.0", optional = true }
syntex_errors = { version = "^0.39.0", optional = true } syntex_errors = { version = "^0.41.0", optional = true }

2
serde_macros/.cargo/config Normal file
View File

@ -0,0 +1,2 @@
# To prevent compiletest from seeing two versions of serde
paths = ["../serde"]

10
serde_macros/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "serde_macros" name = "serde_macros"
version = "0.8.1" version = "0.8.2"
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,7 +16,6 @@ plugin = true
[features] [features]
unstable-testing = [ unstable-testing = [
"clippy",
"skeptic", "skeptic",
"serde_json", "serde_json",
"serde/unstable-testing", "serde/unstable-testing",
@ -28,17 +27,16 @@ skeptic = { version = "^0.6.0", optional = true }
[dependencies] [dependencies]
clippy = { version = "^0.*", optional = true } 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 } skeptic = { version = "^0.6.0", optional = true }
serde_json = { version = "0.8.0", optional = true } serde_json = { version = "0.8.0", optional = true }
[dev-dependencies] [dev-dependencies]
clippy = "^0.*"
compiletest_rs = "^0.2.0" compiletest_rs = "^0.2.0"
fnv = "1.0" fnv = "1.0"
rustc-serialize = "^0.3.16" rustc-serialize = "^0.3.16"
serde = { version = "0.8.1", path = "../serde" } serde = { version = "0.8.2", path = "../serde" }
serde_test = { version = "0.8.1", path = "../serde_test" } serde_test = { version = "0.8.2", path = "../serde_test" }
[[test]] [[test]]
name = "test" name = "test"

2
serde_macros/tests/run-pass/identity-op.rs
View File

@ -1,5 +1,5 @@
#![feature(custom_derive, plugin)] #![feature(custom_derive, plugin)]
#![plugin(serde_macros, clippy)] #![plugin(serde_macros)]
#![deny(identity_op)] #![deny(identity_op)]

4
serde_test/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "serde_test" name = "serde_test"
version = "0.8.1" version = "0.8.2"
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 = "Token De/Serializer for testing De/Serialize implementations" description = "Token De/Serializer for testing De/Serialize implementations"
@ -11,4 +11,4 @@ keywords = ["serde", "serialization"]
include = ["Cargo.toml", "src/**/*.rs"] include = ["Cargo.toml", "src/**/*.rs"]
[dependencies] [dependencies]
serde = { version = "0.8.1", path = "../serde" } serde = { version = "0.8.2", path = "../serde" }

4
testing/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "serde_testing" name = "serde_testing"
version = "0.8.1" version = "0.8.2"
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"
@ -11,7 +11,7 @@ keywords = ["serialization"]
build = "build.rs" build = "build.rs"
[features] [features]
unstable-testing = ["clippy", "serde/unstable-testing", "serde_codegen/unstable-testing"] unstable-testing = ["serde/unstable-testing", "serde_codegen/unstable-testing"]
[build-dependencies] [build-dependencies]
serde_codegen = { path = "../serde_codegen", features = ["with-syntex"] } serde_codegen = { path = "../serde_codegen", features = ["with-syntex"] }