Merge branch origin/master into origin/syn
Conflicts: serde_codegen/Cargo.toml serde_codegen_internals/Cargo.toml serde_derive/Cargo.toml
This commit is contained in:
commit
51f95575ec
@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "serde"
|
||||
version = "0.8.8"
|
||||
version = "0.8.9"
|
||||
authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
|
||||
license = "MIT/Apache-2.0"
|
||||
description = "A generic serialization/deserialization framework"
|
||||
|
@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "serde_codegen"
|
||||
version = "0.8.8"
|
||||
version = "0.8.9"
|
||||
authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
|
||||
license = "MIT/Apache-2.0"
|
||||
description = "Macros to auto-generate implementations for the serde framework"
|
||||
@ -24,7 +24,7 @@ with-syn = []
|
||||
[dependencies]
|
||||
clippy = { version = "^0.*", optional = true }
|
||||
quote = "0.1"
|
||||
serde_codegen_internals = { version = "=0.8.0", default-features = false, path = "../serde_codegen_internals" }
|
||||
serde_codegen_internals = { version = "=0.8.9", default-features = false, path = "../serde_codegen_internals" }
|
||||
syn = { version = "0.5", features = ["aster", "visit"] }
|
||||
syntex = { version = "^0.43.0", optional = true }
|
||||
syntex_syntax = { version = "^0.43.0", optional = true }
|
||||
syntex = { version = "^0.44.0", optional = true }
|
||||
syntex_syntax = { version = "^0.44.0", optional = true }
|
||||
|
@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "serde_codegen_internals"
|
||||
version = "0.8.0"
|
||||
version = "0.8.9"
|
||||
authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
|
||||
license = "MIT/Apache-2.0"
|
||||
description = "AST representation used by Serde codegen. Unstable."
|
||||
|
@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "serde_derive"
|
||||
version = "0.8.8"
|
||||
version = "0.8.9"
|
||||
authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
|
||||
license = "MIT/Apache-2.0"
|
||||
description = "Macros 1.1 implementation of #[derive(Serialize, Deserialize)]"
|
||||
@ -15,12 +15,12 @@ name = "serde_derive"
|
||||
rustc-macro = true
|
||||
|
||||
[dependencies.serde_codegen]
|
||||
version = "=0.8.8"
|
||||
version = "=0.8.9"
|
||||
path = "../serde_codegen"
|
||||
default-features = false
|
||||
features = ["with-syn"]
|
||||
|
||||
[dev-dependencies]
|
||||
fnv = "1.0"
|
||||
serde = { version = "0.8.8", path = "../serde" }
|
||||
serde_test = { version = "0.8.8", path = "../serde_test" }
|
||||
serde = { version = "0.8.9", path = "../serde" }
|
||||
serde_test = { version = "0.8.9", path = "../serde_test" }
|
||||
|
@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "serde_macros"
|
||||
version = "0.8.8"
|
||||
version = "0.8.9"
|
||||
authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
|
||||
license = "MIT/Apache-2.0"
|
||||
description = "Macros to auto-generate implementations for the serde framework"
|
||||
@ -23,14 +23,14 @@ unstable-testing = [
|
||||
|
||||
[dependencies]
|
||||
clippy = { version = "^0.*", optional = true }
|
||||
serde_codegen = { version = "=0.8.8", default-features = false, features = ["unstable"], path = "../serde_codegen" }
|
||||
serde_codegen = { version = "=0.8.9", default-features = false, features = ["unstable"], path = "../serde_codegen" }
|
||||
|
||||
[dev-dependencies]
|
||||
compiletest_rs = "^0.2.0"
|
||||
fnv = "1.0"
|
||||
rustc-serialize = "^0.3.16"
|
||||
serde = { version = "0.8.8", path = "../serde" }
|
||||
serde_test = { version = "0.8.8", path = "../serde_test" }
|
||||
serde = { version = "0.8.9", path = "../serde" }
|
||||
serde_test = { version = "0.8.9", path = "../serde_test" }
|
||||
|
||||
[[test]]
|
||||
name = "test"
|
||||
|
@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "serde_test"
|
||||
version = "0.8.8"
|
||||
version = "0.8.9"
|
||||
authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
|
||||
license = "MIT/Apache-2.0"
|
||||
description = "Token De/Serializer for testing De/Serialize implementations"
|
||||
@ -12,4 +12,4 @@ keywords = ["serde", "serialization"]
|
||||
include = ["Cargo.toml", "src/**/*.rs"]
|
||||
|
||||
[dependencies]
|
||||
serde = { version = "0.8.8", path = "../serde" }
|
||||
serde = { version = "0.8.9", path = "../serde" }
|
||||
|
@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "serde_testing"
|
||||
version = "0.8.8"
|
||||
version = "0.8.9"
|
||||
authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>"]
|
||||
license = "MIT/Apache-2.0"
|
||||
description = "A generic serialization/deserialization framework"
|
||||
|
Loading…
Reference in New Issue
Block a user