commit 9a4dca26c9e8ff52e5b9f226b36beb2fd2018503
author Alex Crichton <alex@alexcrichton.com> Wed Mar 28 06:32:19 2018 -0700
committer David Tolnay <dtolnay@gmail.com> Sat Mar 31 16:55:52 2018 +0200
tree 06c724c7c80cbe5419336bc78c27d831b2eb264e
parent 826fee0d8968cd4d0168cfb7d19e4a1e7d2f5227

Update to proc-macro2 0.3 and tweak apis

tests/test_grouping.rs

diff --git a/tests/test_grouping.rs b/tests/test_grouping.rs
index 8e00068..ca686f6 100644
--- a/tests/test_grouping.rs
+++ b/tests/test_grouping.rs
@@ -22,13 +22,6 @@
 
 mod common;
 
-fn tt(k: TokenNode) -> TokenTree {
-    TokenTree {
-        span: Span::def_site(),
-        kind: k,
-    }
-}
-
 fn expr<T: Into<Expr>>(t: T) -> Expr {
     t.into()
 }
@@ -36,26 +29,26 @@
 fn lit<T: Into<Literal>>(t: T) -> Expr {
     Expr::Lit(ExprLit {
         attrs: Vec::new(),
-        lit: Lit::new(t.into(), Span::def_site()),
+        lit: Lit::new(t.into()),
     })
 }
 
 #[test]
 fn test_grouping() {
     let raw: TokenStream = vec![
-        tt(TokenNode::Literal(Literal::i32(1))),
-        tt(TokenNode::Op('+', Spacing::Alone)),
-        tt(TokenNode::Group(
+        TokenTree::Literal(Literal::i32_suffixed(1)),
+        TokenTree::Op(Op::new('+', Spacing::Alone)),
+        TokenTree::Group(proc_macro2::Group::new(
             Delimiter::None,
             vec![
-                tt(TokenNode::Literal(Literal::i32(2))),
-                tt(TokenNode::Op('+', Spacing::Alone)),
-                tt(TokenNode::Literal(Literal::i32(3))),
+                TokenTree::Literal(Literal::i32_suffixed(2)),
+                TokenTree::Op(Op::new('+', Spacing::Alone)),
+                TokenTree::Literal(Literal::i32_suffixed(3)),
             ].into_iter()
                 .collect(),
         )),
-        tt(TokenNode::Op('*', Spacing::Alone)),
-        tt(TokenNode::Literal(Literal::i32(4))),
+        TokenTree::Op(Op::new('*', Spacing::Alone)),
+        TokenTree::Literal(Literal::i32_suffixed(4)),
     ].into_iter()
         .collect();
 
@@ -65,7 +58,7 @@
         common::parse::syn::<Expr>(raw),
         expr(ExprBinary {
             attrs: Vec::new(),
-            left: Box::new(lit(Literal::i32(1))),
+            left: Box::new(lit(Literal::i32_suffixed(1))),
             op: BinOp::Add(<Token![+]>::default()),
             right: Box::new(expr(ExprBinary {
                 attrs: Vec::new(),
@@ -74,13 +67,13 @@
                     group_token: Group::default(),
                     expr: Box::new(expr(ExprBinary {
                         attrs: Vec::new(),
-                        left: Box::new(lit(Literal::i32(2))),
+                        left: Box::new(lit(Literal::i32_suffixed(2))),
                         op: BinOp::Add(<Token![+]>::default()),
-                        right: Box::new(lit(Literal::i32(3))),
+                        right: Box::new(lit(Literal::i32_suffixed(3))),
                     })),
                 })),
                 op: BinOp::Mul(<Token![*]>::default()),
-                right: Box::new(lit(Literal::i32(4))),
+                right: Box::new(lit(Literal::i32_suffixed(4))),
             })),
         })
     );
@@ -89,19 +82,19 @@
 #[test]
 fn test_invalid_grouping() {
     let raw: TokenStream = vec![
-        tt(TokenNode::Literal(Literal::i32(1))),
-        tt(TokenNode::Op('+', Spacing::Alone)),
-        tt(TokenNode::Group(
+        TokenTree::Literal(Literal::i32_suffixed(1)),
+        TokenTree::Op(Op::new('+', Spacing::Alone)),
+        TokenTree::Group(proc_macro2::Group::new(
             Delimiter::None,
             vec![
-                tt(TokenNode::Literal(Literal::i32(2))),
-                tt(TokenNode::Op('+', Spacing::Alone)),
+                TokenTree::Literal(Literal::i32_suffixed(2)),
+                TokenTree::Op(Op::new('+', Spacing::Alone)),
             ].into_iter()
                 .collect(),
         )),
-        tt(TokenNode::Literal(Literal::i32(3))),
-        tt(TokenNode::Op('*', Spacing::Alone)),
-        tt(TokenNode::Literal(Literal::i32(4))),
+        TokenTree::Literal(Literal::i32_suffixed(3)),
+        TokenTree::Op(Op::new('*', Spacing::Alone)),
+        TokenTree::Literal(Literal::i32_suffixed(4)),
     ].into_iter()
         .collect();
 
@@ -113,16 +106,16 @@
             attrs: Vec::new(),
             left: Box::new(expr(ExprBinary {
                 attrs: Vec::new(),
-                left: Box::new(lit(Literal::i32(1))),
+                left: Box::new(lit(Literal::i32_suffixed(1))),
                 op: BinOp::Add(<Token![+]>::default()),
-                right: Box::new(lit(Literal::i32(2))),
+                right: Box::new(lit(Literal::i32_suffixed(2))),
             })),
             op: BinOp::Add(<Token![+]>::default()),
             right: Box::new(expr(ExprBinary {
                 attrs: Vec::new(),
-                left: Box::new(lit(Literal::i32(3))),
+                left: Box::new(lit(Literal::i32_suffixed(3))),
                 op: BinOp::Mul(<Token![*]>::default()),
-                right: Box::new(lit(Literal::i32(4))),
+                right: Box::new(lit(Literal::i32_suffixed(4))),
             })),
         })
     );