Update for rust-lang/rust#29850

This will of course break the build on stable, as syntex_syntax will
need to be updated as well. The suite now passes on nightly, however.
Though the pull request upstream which broke this adds support for
attributes in statement and expression contexts, I've opted not to
actually support it here yet, as we presumably cannot handle that on
stable for at least 2 more Rust versions.

Fixes serde-deprecated#56

Author: sgrif

src/expr.rs

@@ -52,6 +52,7 @@ impl<F> ExprBuilder<F>
             id: ast::DUMMY_NODE_ID,
             node: expr,
             span: self.span,
+            attrs: None,
         });
         self.build(expr)
     }

src/mac.rs

@@ -3,7 +3,7 @@ use syntax::codemap::{self, DUMMY_SP, Span, respan};
 use syntax::ext::base::ExtCtxt;
 use syntax::ext::expand;
 use syntax::ext::quote::rt::ToTokens;
-use syntax::feature_gate::GatedCfg;
+use syntax::feature_gate::GatedCfgAttr;
 use syntax::parse::ParseSess;
 use syntax::ptr::P;
 
@@ -96,7 +96,7 @@ impl<F> Invoke<P<ast::Expr>> for MacBuilder<F>
 }
 
 fn make_ext_ctxt<'a>(sess: &'a ParseSess,
-                     feature_gated_cfgs: &'a mut Vec<GatedCfg>) -> ExtCtxt<'a> {
+                     feature_gated_cfgs: &'a mut Vec<GatedCfgAttr>) -> ExtCtxt<'a> {
     let info = codemap::ExpnInfo {
         call_site: codemap::DUMMY_SP,
         callee: codemap::NameAndSpan {

src/stmt.rs

@@ -57,6 +57,7 @@ impl<F> StmtBuilder<F>
             init: init,
             id: ast::DUMMY_NODE_ID,
             span: self.span,
+            attrs: None,
         };
 
         let decl = respan(self.span, ast::Decl_::DeclLocal(P(local)));

tests/test_expr.rs

@@ -15,6 +15,7 @@ fn test_lit() {
                 id: ast::DUMMY_NODE_ID,
                 node: ast::ExprLit(lit),
                 span: DUMMY_SP,
+                attrs: None,
             })
         );
     }
@@ -53,6 +54,7 @@ fn test_path() {
                 builder.path().id("x").build(),
             ),
             span: DUMMY_SP,
+            attrs: None,
         })
     );
 }
@@ -77,6 +79,7 @@ fn test_qpath() {
                 builder.path().id("into_vec").build(),
             ),
             span: DUMMY_SP,
+            attrs: None,
         })
     );
 
@@ -100,6 +103,7 @@ fn test_qpath() {
                     .build(),
             ),
             span: DUMMY_SP,
+            attrs: None,
         })
     );
 }
@@ -122,6 +126,7 @@ fn test_bin() {
                 builder.expr().i8(2),
             ),
             span: DUMMY_SP,
+            attrs: None,
         })
     );
 }
@@ -136,6 +141,7 @@ fn test_unit() {
             id: ast::DUMMY_NODE_ID,
             node: ast::ExprTup(vec![]),
             span: DUMMY_SP,
+            attrs: None,
         })
     );
 
@@ -145,6 +151,7 @@ fn test_unit() {
             id: ast::DUMMY_NODE_ID,
             node: ast::ExprTup(vec![]),
             span: DUMMY_SP,
+            attrs: None,
         })
     );
 }
@@ -174,9 +181,11 @@ fn test_tuple() {
                         builder.expr().isize(2),
                     ]),
                     span: DUMMY_SP,
+                    attrs: None,
                 })
             ]),
             span: DUMMY_SP,
+            attrs: None,
         })
     );
 }
@@ -201,6 +210,7 @@ fn test_slice() {
                 builder.expr().i8(3),
             ]),
             span: DUMMY_SP,
+            attrs: None,
         })
     );
 }

tests/test_stmt.rs

@@ -22,6 +22,7 @@ fn test_let() {
                         init: None,
                         id: ast::DUMMY_NODE_ID,
                         span: DUMMY_SP,
+                        attrs: None,
                     })),
                 )),
                 ast::DUMMY_NODE_ID,
@@ -43,6 +44,7 @@ fn test_let() {
                         init: None,
                         id: ast::DUMMY_NODE_ID,
                         span: DUMMY_SP,
+                        attrs: None,
                     })),
                 )),
                 ast::DUMMY_NODE_ID,
@@ -64,6 +66,7 @@ fn test_let() {
                         init: Some(builder.expr().i8(5)),
                         id: ast::DUMMY_NODE_ID,
                         span: DUMMY_SP,
+                        attrs: None,
                     })),
                 )),
                 ast::DUMMY_NODE_ID,
@@ -85,6 +88,7 @@ fn test_let() {
                         init: Some(builder.expr().i8(5)),
                         id: ast::DUMMY_NODE_ID,
                         span: DUMMY_SP,
+                        attrs: None,
                     })),
                 )),
                 ast::DUMMY_NODE_ID,
@@ -121,6 +125,7 @@ fn test_let() {
                         ),
                         id: ast::DUMMY_NODE_ID,
                         span: DUMMY_SP,
+                        attrs: None,
                     })),
                 )),
                 ast::DUMMY_NODE_ID,

tests/test_ty.rs

@@ -39,6 +39,7 @@ fn test_qpath() {
                 builder.path().id("into_vec").build(),
             ),
             span: DUMMY_SP,
+            attrs: None,
         })
     );
 
@@ -62,6 +63,7 @@ fn test_qpath() {
                     .build(),
             ),
             span: DUMMY_SP,
+            attrs: None,
         })
     );
 }