pezkuwichain/serde
1
0
Fork 0
mirror of https://github.com/pezkuwichain/serde.git synced 2026-06-13 04:21:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v0.6.x'

Browse Source 
# Conflicts:
#	serde_codegen/src/de.rs
This commit is contained in:
Erick Tryzelaar
2016-02-14 16:45:59 -08:00
parent 561a373d19 fd5ab8c5c8
commit 1236889664
5 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
serde/Cargo.toml
+2 -2
View File
@@ -1,6 +1,6 @@
[package] [package]
name = "serde" name = "serde"
version = "0.6.12" version = "0.6.13"
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,5 +17,5 @@ num-impls = ["num-bigint", "num-complex", "num-rational"]
num-rational = ["num/rational"] num-rational = ["num/rational"]
[dependencies] [dependencies]
clippy = { version = "^0.0.39", optional = true } clippy = { version = "^0.0.41", optional = true }
num = { version = "^0.1.27", default-features = false } num = { version = "^0.1.27", default-features = false }
serde_codegen/Cargo.toml
+9 -9
View File
@@ -1,6 +1,6 @@
[package] [package]
name = "serde_codegen" name = "serde_codegen"
version = "0.6.12" version = "0.6.13"
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,13 +16,13 @@ nightly-testing = ["clippy"]
with-syntex = ["quasi/with-syntex", "quasi_codegen", "quasi_codegen/with-syntex", "syntex", "syntex_syntax"] with-syntex = ["quasi/with-syntex", "quasi_codegen", "quasi_codegen/with-syntex", "syntex", "syntex_syntax"]
[build-dependencies] [build-dependencies]
quasi_codegen = { version = "^0.5.0", optional = true } quasi_codegen = { version = "^0.6.0", optional = true }
syntex = { version = "^0.27.0", optional = true } syntex = { version = "^0.28.0", optional = true }
[dependencies] [dependencies]
aster = { version = "^0.11.0", default-features = false } aster = { version = "^0.12.0", default-features = false }
clippy = { version = "^0.0.39", optional = true } clippy = { version = "^0.0.41", optional = true }
quasi = { version = "^0.5.0", default-features = false } quasi = { version = "^0.6.0", default-features = false }
quasi_macros = { version = "^0.5.0", optional = true } quasi_macros = { version = "^0.6.0", optional = true }
syntex = { version = "^0.27.0", optional = true } syntex = { version = "^0.28.0", optional = true }
syntex_syntax = { version = "^0.27.0", optional = true } syntex_syntax = { version = "^0.28.0", optional = true }
serde_codegen/src/de.rs
+4 -4
View File
@@ -397,7 +397,7 @@ fn deserialize_seq(
struct_path: ast::Path, struct_path: ast::Path,
fields: usize, fields: usize,
) -> P<ast::Expr> { ) -> P<ast::Expr> {
let let_values: Vec<P<ast::Stmt>> = (0 .. fields) let let_values: Vec<ast::Stmt> = (0 .. fields)
.map(|i| { .map(|i| {
let name = builder.id(format!("__field{}", i)); let name = builder.id(format!("__field{}", i));
quote_stmt!(cx, quote_stmt!(cx,
@@ -431,7 +431,7 @@ fn deserialize_struct_as_seq(
struct_path: ast::Path, struct_path: ast::Path,
fields: &[ast::StructField], fields: &[ast::StructField],
) -> Result<P<ast::Expr>, Error> { ) -> Result<P<ast::Expr>, Error> {
let let_values: Vec<P<ast::Stmt>> = (0 .. fields.len()) let let_values: Vec<_> = (0 .. fields.len())
.map(|i| { .map(|i| {
let name = builder.id(format!("__field{}", i)); let name = builder.id(format!("__field{}", i));
quote_stmt!(cx, quote_stmt!(cx,
@@ -920,7 +920,7 @@ fn deserialize_struct_visitor(
struct_path: ast::Path, struct_path: ast::Path,
fields: &[ast::StructField], fields: &[ast::StructField],
container_attrs: &attr::ContainerAttrs, container_attrs: &attr::ContainerAttrs,
) -> Result<(Vec<P<ast::Item>>, P<ast::Stmt>, P<ast::Expr>), Error> { ) -> Result<(Vec<P<ast::Item>>, ast::Stmt, P<ast::Expr>), Error> {
let field_visitor = deserialize_field_visitor( let field_visitor = deserialize_field_visitor(
cx, cx,
builder, builder,
@@ -977,7 +977,7 @@ fn deserialize_map(
.collect(); .collect();
// Declare each field. // Declare each field.
let let_values: Vec<P<ast::Stmt>> = field_names.iter() let let_values: Vec<ast::Stmt> = field_names.iter()
.map(|field_name| quote_stmt!(cx, let mut $field_name = None;).unwrap()) .map(|field_name| quote_stmt!(cx, let mut $field_name = None;).unwrap())
.collect(); .collect();
serde_macros/Cargo.toml
+4 -4
View File
@@ -1,6 +1,6 @@
[package] [package]
name = "serde_macros" name = "serde_macros"
version = "0.6.12" version = "0.6.13"
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,14 +16,14 @@ plugin = true
nightly-testing = ["clippy", "serde/nightly-testing", "serde_codegen/nightly-testing"] nightly-testing = ["clippy", "serde/nightly-testing", "serde_codegen/nightly-testing"]
[dependencies] [dependencies]
clippy = { version = "^0.0.39", optional = true } clippy = { version = "^0.0.41", optional = true }
serde_codegen = { version = "^0.6.12", path = "../serde_codegen", default-features = false, features = ["nightly"] } serde_codegen = { version = "^0.6.13", path = "../serde_codegen", default-features = false, features = ["nightly"] }
[dev-dependencies] [dev-dependencies]
compiletest_rs = "^0.0.11" compiletest_rs = "^0.0.11"
num = "^0.1.27" num = "^0.1.27"
rustc-serialize = "^0.3.16" rustc-serialize = "^0.3.16"
serde = { version = "^0.6.12", path = "../serde", features = ["num-impls"] } serde = { version = "^0.6.13", path = "../serde", features = ["num-impls"] }
[[test]] [[test]]
name = "test" name = "test"
serde_tests/Cargo.toml
+5 -5
View File
@@ -14,18 +14,18 @@ build = "build.rs"
nightly-testing = ["clippy", "serde/nightly-testing", "serde_codegen/nightly-testing"] nightly-testing = ["clippy", "serde/nightly-testing", "serde_codegen/nightly-testing"]
[build-dependencies] [build-dependencies]
syntex = { version = "^0.27.0" } syntex = { version = "^0.28.0" }
syntex_syntax = { version = "^0.27.0" } syntex_syntax = { version = "^0.28.0" }
serde_codegen = { version = "^0.6.12", path = "../serde_codegen", features = ["with-syntex"] } serde_codegen = { version = "^0.6.13", path = "../serde_codegen", features = ["with-syntex"] }
[dev-dependencies] [dev-dependencies]
num = "^0.1.26" num = "^0.1.26"
rustc-serialize = "^0.3.16" rustc-serialize = "^0.3.16"
serde = { version = "*", path = "../serde", features = ["num-impls"] } serde = { version = "*", path = "../serde", features = ["num-impls"] }
syntex = "^0.27.0" syntex = "^0.28.0"
[dependencies] [dependencies]
clippy = { version = "^0.0.39", optional = true } clippy = { version = "^0.0.41", optional = true }
[[test]] [[test]]
name = "test" name = "test"