Fix test fallout from proc_macro2
diff --git a/tests/common/respan.rs b/tests/common/respan.rs
index d96ba40..c9d12f5 100644
--- a/tests/common/respan.rs
+++ b/tests/common/respan.rs
@@ -7,7 +7,7 @@
use syntex_syntax::fold::{self, Folder};
use syntex_syntax::parse::token::{Lit, Token};
use syntex_syntax::ptr::P;
-use syntex_syntax::symbol::Term;
+use syntex_syntax::symbol::Symbol;
use syntex_syntax::tokenstream::{Delimited, TokenTree};
use syntex_syntax::util::move_map::MoveMap;
use syntex_syntax::util::small_vector::SmallVector;
@@ -27,12 +27,12 @@
// so many equivalent representations of the same literal; they are
// tested elsewhere
match l {
- Lit::Byte(_) => Lit::Byte(Term::intern("")),
- Lit::Char(_) => Lit::Char(Term::intern("")),
- Lit::Integer(_) => Lit::Integer(Term::intern("")),
- Lit::Float(_) => Lit::Float(Term::intern("")),
- Lit::Str_(_) => Lit::Str_(Term::intern("")),
- Lit::ByteStr(_) => Lit::ByteStr(Term::intern("")),
+ Lit::Byte(_) => Lit::Byte(Symbol::intern("")),
+ Lit::Char(_) => Lit::Char(Symbol::intern("")),
+ Lit::Integer(_) => Lit::Integer(Symbol::intern("")),
+ Lit::Float(_) => Lit::Float(Symbol::intern("")),
+ Lit::Str_(_) => Lit::Str_(Symbol::intern("")),
+ Lit::ByteStr(_) => Lit::ByteStr(Symbol::intern("")),
_ => l,
}
}
@@ -163,7 +163,7 @@
MetaItem {
name: name,
node: match node {
- MetaItemKind::Term => MetaItemKind::Term,
+ MetaItemKind::Word => MetaItemKind::Word,
MetaItemKind::List(nested) => {
MetaItemKind::List(nested.move_map(|e| self.fold_meta_list_item(e)))
}
diff --git a/tests/test_derive_input.rs b/tests/test_derive_input.rs
index d68b3be..1437e3b 100644
--- a/tests/test_derive_input.rs
+++ b/tests/test_derive_input.rs
@@ -4,7 +4,7 @@
extern crate proc_macro2;
use syn::*;
-use proc_macro2::{TokenNode, Spacing, Delimiter, Literal};
+use proc_macro2::{TokenNode, Spacing, Delimiter, Literal, Term};
use proc_macro2::Delimiter::{Parenthesis, Brace};
fn op(c: char) -> TokenTree {
@@ -24,7 +24,7 @@
fn word(sym: &str) -> TokenTree {
TokenTree(proc_macro2::TokenTree {
span: Default::default(),
- kind: TokenNode::Term(sym.into()),
+ kind: TokenNode::Term(Term::intern(sym)),
})
}
@@ -258,7 +258,7 @@
eq_token: Some(Default::default()),
discriminant: Some(Expr{
node: Lit {
- value: LitKind::Other(0isize.into()),
+ value: LitKind::Other(Literal::isize(0)),
span: Default::default(),
}.into(),
attrs: Vec::new(),
@@ -278,14 +278,14 @@
args: vec![
Expr {
node: ExprKind::Lit(Lit {
- value: LitKind::Other(Literal::integer("0")),
+ value: LitKind::Other(Literal::integer(0)),
span: Default::default(),
}),
attrs: Vec::new(),
},
Expr {
node: ExprKind::Lit(Lit {
- value: LitKind::Other("data".into()),
+ value: LitKind::Other(Literal::string("data")),
span: Default::default(),
}),
attrs: Vec::new(),
@@ -296,7 +296,7 @@
}),
dot_token: Default::default(),
field: Lit {
- value: LitKind::Other(Literal::integer("0")),
+ value: LitKind::Other(Literal::integer(0)),
span: Default::default(),
},
}.into(),
@@ -363,7 +363,7 @@
word("foo"),
delimited(Parenthesis, vec![]),
op(','),
- lit("Hello, world!"),
+ lit(Literal::string("Hello, world!")),
]),
op(';'),
]),
diff --git a/tests/test_generics.rs b/tests/test_generics.rs
index 8bb6171..f743b78 100644
--- a/tests/test_generics.rs
+++ b/tests/test_generics.rs
@@ -6,6 +6,9 @@
#[macro_use]
extern crate quote;
+extern crate proc_macro2;
+use proc_macro2::Term;
+
#[test]
fn test_split_for_impl() {
// <'a, 'b: 'a, #[may_dangle] T: 'a = ()> where T: Debug
@@ -15,14 +18,14 @@
lifetimes: vec![
LifetimeDef {
attrs: Default::default(),
- lifetime: Lifetime::new("'a".into(), Span::default()),
+ lifetime: Lifetime::new(Term::intern("'a"), Span::default()),
bounds: Default::default(),
colon_token: None,
},
LifetimeDef {
attrs: Default::default(),
- lifetime: Lifetime::new("'b".into(), Span::default()),
- bounds: vec![Lifetime::new("'a".into(), Span::default())].into(),
+ lifetime: Lifetime::new(Term::intern("'b"), Span::default()),
+ bounds: vec![Lifetime::new(Term::intern("'a"), Span::default())].into(),
colon_token: Some(tokens::Colon::default()),
},
].into(),
@@ -37,7 +40,7 @@
is_sugared_doc: false,
}],
ident: "T".into(),
- bounds: vec![TyParamBound::Region(Lifetime::new("'a".into(), Span::default()))].into(),
+ bounds: vec![TyParamBound::Region(Lifetime::new(Term::intern("'a"), Span::default()))].into(),
default: Some(TyTup {
tys: Default::default(),
lone_comma: None,
@@ -92,7 +95,7 @@
#[test]
fn test_ty_param_bound() {
let tokens = quote!('a);
- let expected = TyParamBound::Region(Lifetime::new("'a".into(), Span::default()));
+ let expected = TyParamBound::Region(Lifetime::new(Term::intern("'a"), Span::default()));
assert_eq!(expected, tokens.to_string().parse().unwrap());
let tokens = quote!(Debug);
diff --git a/tests/test_grouping.rs b/tests/test_grouping.rs
index b8e67dd..f41f9ce 100644
--- a/tests/test_grouping.rs
+++ b/tests/test_grouping.rs
@@ -30,33 +30,33 @@
#[test]
fn test_grouping() {
let raw: TokenStream = vec![
- tt(TokenNode::Literal(Literal::from(1))),
+ tt(TokenNode::Literal(Literal::i32(1))),
tt(TokenNode::Op('+', Spacing::Alone)),
tt(TokenNode::Group(Delimiter::None, vec![
- tt(TokenNode::Literal(Literal::from(2))),
+ tt(TokenNode::Literal(Literal::i32(2))),
tt(TokenNode::Op('+', Spacing::Alone)),
- tt(TokenNode::Literal(Literal::from(3))),
+ tt(TokenNode::Literal(Literal::i32(3))),
].into_iter().collect())),
tt(TokenNode::Op('*', Spacing::Alone)),
- tt(TokenNode::Literal(Literal::from(4))),
+ tt(TokenNode::Literal(Literal::i32(4))),
].into_iter().collect();
assert_eq!(raw.to_string(), "1i32 + 2i32 + 3i32 * 4i32");
assert_eq!(Expr::parse_all(raw).unwrap(), expr(ExprBinary {
- left: Box::new(lit(1)),
+ left: Box::new(lit(Literal::i32(1))),
op: BinOp::Add(tokens::Add::default()),
right: Box::new(expr(ExprBinary {
left: Box::new(expr(ExprGroup {
group_token: tokens::Group::default(),
expr: Box::new(expr(ExprBinary {
- left: Box::new(lit(2)),
+ left: Box::new(lit(Literal::i32(2))),
op: BinOp::Add(tokens::Add::default()),
- right: Box::new(lit(3)),
+ right: Box::new(lit(Literal::i32(3))),
})),
})),
op: BinOp::Mul(tokens::Star::default()),
- right: Box::new(lit(4)),
+ right: Box::new(lit(Literal::i32(4))),
})),
}));
}
@@ -64,30 +64,30 @@
#[test]
fn test_invalid_grouping() {
let raw: TokenStream = vec![
- tt(TokenNode::Literal(Literal::from(1))),
+ tt(TokenNode::Literal(Literal::i32(1))),
tt(TokenNode::Op('+', Spacing::Alone)),
tt(TokenNode::Group(Delimiter::None, vec![
- tt(TokenNode::Literal(Literal::from(2))),
+ tt(TokenNode::Literal(Literal::i32(2))),
tt(TokenNode::Op('+', Spacing::Alone)),
].into_iter().collect())),
- tt(TokenNode::Literal(Literal::from(3))),
+ tt(TokenNode::Literal(Literal::i32(3))),
tt(TokenNode::Op('*', Spacing::Alone)),
- tt(TokenNode::Literal(Literal::from(4))),
+ tt(TokenNode::Literal(Literal::i32(4))),
].into_iter().collect();
assert_eq!(raw.to_string(), "1i32 + 2i32 + 3i32 * 4i32");
assert_eq!(Expr::parse_all(raw).unwrap(), expr(ExprBinary {
left: Box::new(expr(ExprBinary {
- left: Box::new(lit(1)),
+ left: Box::new(lit(Literal::i32(1))),
op: BinOp::Add(tokens::Add::default()),
- right: Box::new(lit(2)),
+ right: Box::new(lit(Literal::i32(2))),
})),
op: BinOp::Add(tokens::Add::default()),
right: Box::new(expr(ExprBinary {
- left: Box::new(lit(3)),
+ left: Box::new(lit(Literal::i32(3))),
op: BinOp::Mul(tokens::Star::default()),
- right: Box::new(lit(4)),
+ right: Box::new(lit(Literal::i32(4))),
})),
}));
}
diff --git a/tests/test_meta_item.rs b/tests/test_meta_item.rs
index 14b2127..26502c9 100644
--- a/tests/test_meta_item.rs
+++ b/tests/test_meta_item.rs
@@ -25,7 +25,7 @@
run_test("#[foo = 5]", MetaNameValue {
ident: "foo".into(),
eq_token: Default::default(),
- lit: lit(Literal::integer("5")),
+ lit: lit(Literal::integer(5)),
})
}
@@ -35,7 +35,7 @@
ident: "foo".into(),
paren_token: Default::default(),
nested: vec![
- NestedMetaItem::Literal(lit(Literal::integer("5"))),
+ NestedMetaItem::Literal(lit(Literal::integer(5))),
].into(),
})
}
@@ -60,7 +60,7 @@
NestedMetaItem::MetaItem(MetaNameValue {
ident: "bar".into(),
eq_token: Default::default(),
- lit: lit(Literal::integer("5"))
+ lit: lit(Literal::integer(5))
}.into()),
].into(),
})
@@ -76,7 +76,7 @@
NestedMetaItem::MetaItem(MetaNameValue {
ident: "name".into(),
eq_token: Default::default(),
- lit: lit(Literal::integer("5")),
+ lit: lit(Literal::integer(5)),
}.into()),
NestedMetaItem::MetaItem(MetaItemList {
ident: "list".into(),
@@ -85,7 +85,7 @@
NestedMetaItem::MetaItem(MetaNameValue {
ident: "name2".into(),
eq_token: Default::default(),
- lit: lit(Literal::integer("6")),
+ lit: lit(Literal::integer(6)),
}.into())
].into(),
}.into()),
diff --git a/tests/test_token_trees.rs b/tests/test_token_trees.rs
index 7e43ea5..de9eb0b 100644
--- a/tests/test_token_trees.rs
+++ b/tests/test_token_trees.rs
@@ -6,7 +6,7 @@
extern crate proc_macro2;
use syn::{Lit, TokenTree};
-use proc_macro2::{TokenNode, Spacing, Delimiter, TokenStream};
+use proc_macro2::{TokenNode, Spacing, Delimiter, TokenStream, Term};
use proc_macro2::Delimiter::*;
fn alone(c: char) -> TokenTree {
@@ -33,7 +33,7 @@
fn word(sym: &str) -> TokenTree {
TokenTree(proc_macro2::TokenTree {
span: Default::default(),
- kind: TokenNode::Term(sym.into()),
+ kind: TokenNode::Term(Term::intern(sym)),
})
}