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

Merge branch origin/master into origin/syn

Browse Source 
Conflicts:
    serde_codegen/Cargo.toml
    serde_codegen_internals/Cargo.toml
    serde_derive/Cargo.toml
This commit is contained in:
David Tolnay 2016-09-24 09:28:08 -07:00
commit 51f95575ec
No known key found for this signature in database
GPG Key ID: F9BA143B95FF6D82
7 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
serde/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "serde" name = "serde"
version = "0.8.8" version = "0.8.9"
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"

8
serde_codegen/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "serde_codegen" name = "serde_codegen"
version = "0.8.8" version = "0.8.9"
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"
@ -24,7 +24,7 @@ with-syn = []
[dependencies] [dependencies]
clippy = { version = "^0.*", optional = true } clippy = { version = "^0.*", optional = true }
quote = "0.1" 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"] } syn = { version = "0.5", features = ["aster", "visit"] }
syntex = { version = "^0.43.0", optional = true } syntex = { version = "^0.44.0", optional = true }
syntex_syntax = { version = "^0.43.0", optional = true } syntex_syntax = { version = "^0.44.0", optional = true }

2
serde_codegen_internals/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "serde_codegen_internals" name = "serde_codegen_internals"
version = "0.8.0" version = "0.8.9"
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."

8
serde_derive/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "serde_derive" name = "serde_derive"
version = "0.8.8" version = "0.8.9"
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 1.1 implementation of #[derive(Serialize, Deserialize)]" description = "Macros 1.1 implementation of #[derive(Serialize, Deserialize)]"
@ -15,12 +15,12 @@ name = "serde_derive"
rustc-macro = true rustc-macro = true
[dependencies.serde_codegen] [dependencies.serde_codegen]
version = "=0.8.8" version = "=0.8.9"
path = "../serde_codegen" path = "../serde_codegen"
default-features = false default-features = false
features = ["with-syn"] features = ["with-syn"]
[dev-dependencies] [dev-dependencies]
fnv = "1.0" fnv = "1.0"
serde = { version = "0.8.8", path = "../serde" } serde = { version = "0.8.9", path = "../serde" }
serde_test = { version = "0.8.8", path = "../serde_test" } serde_test = { version = "0.8.9", path = "../serde_test" }

8
serde_macros/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "serde_macros" name = "serde_macros"
version = "0.8.8" version = "0.8.9"
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"
@ -23,14 +23,14 @@ unstable-testing = [
[dependencies] [dependencies]
clippy = { version = "^0.*", optional = true } 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] [dev-dependencies]
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.8", path = "../serde" } serde = { version = "0.8.9", path = "../serde" }
serde_test = { version = "0.8.8", path = "../serde_test" } serde_test = { version = "0.8.9", path = "../serde_test" }
[[test]] [[test]]
name = "test" name = "test"

4
serde_test/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "serde_test" name = "serde_test"
version = "0.8.8" version = "0.8.9"
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"
@ -12,4 +12,4 @@ keywords = ["serde", "serialization"]
include = ["Cargo.toml", "src/**/*.rs"] include = ["Cargo.toml", "src/**/*.rs"]
[dependencies] [dependencies]
serde = { version = "0.8.8", path = "../serde" } serde = { version = "0.8.9", path = "../serde" }

2
testing/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "serde_testing" name = "serde_testing"
version = "0.8.8" version = "0.8.9"
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"