mirror of
https://github.com/pezkuwichain/serde.git
synced 2026-06-18 00:21:01 +00:00
Update serde_codegen for rustc 1.8.0-nightly (ce4b75f25 2016-02-12)
This commit is contained in:
@@ -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 }
|
||||||
|
|||||||
@@ -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() {
|
||||||
|
|||||||
Reference in New Issue
Block a user