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

Merge pull request #236 from debris/rustup3

Browse Source 
Update serde_codegen for rustc 1.8.0-nightly (ce4b75f25 2016-02-12)
This commit is contained in:
Erick Tryzelaar 2016-02-13 21:56:07 -08:00
commit 39fa78e2ec
5 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
serde/Cargo.toml
View File

@ -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 }

16
serde_codegen/Cargo.toml
View File

@ -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 }

10
serde_codegen/src/de.rs
View File

@ -393,7 +393,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,
@ -427,7 +427,7 @@ fn deserialize_struct_as_seq(
struct_path: ast::Path, struct_path: ast::Path,
fields: &[ast::StructField], fields: &[ast::StructField],
) -> Result<P<ast::Expr>, ()> { ) -> Result<P<ast::Expr>, ()> {
let let_values: Vec<P<ast::Stmt>> = (0 .. fields.len()) let let_values: Vec<ast::Stmt> = (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,
@ -930,7 +930,7 @@ fn deserialize_struct_visitor(
builder: &aster::AstBuilder, builder: &aster::AstBuilder,
struct_path: ast::Path, struct_path: ast::Path,
fields: &[ast::StructField], fields: &[ast::StructField],
) -> Result<(Vec<P<ast::Item>>, P<ast::Stmt>, P<ast::Expr>), ()> { ) -> Result<(Vec<P<ast::Item>>, ast::Stmt, P<ast::Expr>), ()> {
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();
@ -994,7 +994,7 @@ fn deserialize_map(
let field_attrs = try!(field::struct_field_attrs(cx, builder, fields)); let field_attrs = try!(field::struct_field_attrs(cx, builder, fields));
let extract_values: Vec<P<ast::Stmt>> = field_names.iter() let extract_values: Vec<ast::Stmt> = field_names.iter()
.zip(field_attrs.iter()) .zip(field_attrs.iter())
.map(|(field_name, field_attr)| { .map(|(field_name, field_attr)| {
let missing_expr = if field_attr.use_default() { let missing_expr = if field_attr.use_default() {

2
serde_macros/Cargo.toml
View File

@ -16,7 +16,7 @@ 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.12", path = "../serde_codegen", default-features = false, features = ["nightly"] }
[dev-dependencies] [dev-dependencies]

8
serde_tests/Cargo.toml
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.12", 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"