Update to published version of `proc_macro2`
diff --git a/tests/common/respan.rs b/tests/common/respan.rs
index c9d12f5..d96ba40 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::Symbol;
+use syntex_syntax::symbol::Term;
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(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("")),
+ 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("")),
_ => l,
}
}
@@ -163,7 +163,7 @@
MetaItem {
name: name,
node: match node {
- MetaItemKind::Word => MetaItemKind::Word,
+ MetaItemKind::Term => MetaItemKind::Term,
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 358b195..d68b3be 100644
--- a/tests/test_derive_input.rs
+++ b/tests/test_derive_input.rs
@@ -4,34 +4,34 @@
extern crate proc_macro2;
use syn::*;
-use proc_macro2::{TokenKind, OpKind, Delimiter, Literal};
+use proc_macro2::{TokenNode, Spacing, Delimiter, Literal};
use proc_macro2::Delimiter::{Parenthesis, Brace};
fn op(c: char) -> TokenTree {
TokenTree(proc_macro2::TokenTree {
span: Default::default(),
- kind: TokenKind::Op(c, OpKind::Alone),
+ kind: TokenNode::Op(c, Spacing::Alone),
})
}
fn lit<T: Into<Literal>>(t: T) -> TokenTree {
TokenTree(proc_macro2::TokenTree {
span: Default::default(),
- kind: TokenKind::Literal(t.into()),
+ kind: TokenNode::Literal(t.into()),
})
}
fn word(sym: &str) -> TokenTree {
TokenTree(proc_macro2::TokenTree {
span: Default::default(),
- kind: TokenKind::Word(sym.into()),
+ kind: TokenNode::Term(sym.into()),
})
}
fn delimited(delim: Delimiter, tokens: Vec<TokenTree>) -> TokenTree {
TokenTree(proc_macro2::TokenTree {
span: Default::default(),
- kind: TokenKind::Sequence(delim, tokens.into_iter().map(|t| t.0).collect()),
+ kind: TokenNode::Group(delim, tokens.into_iter().map(|t| t.0).collect()),
})
}
@@ -144,8 +144,8 @@
ident: "derive".into(),
paren_token: Default::default(),
nested: vec![
- NestedMetaItem::MetaItem(MetaItem::Word("Debug".into())),
- NestedMetaItem::MetaItem(MetaItem::Word("Clone".into())),
+ NestedMetaItem::MetaItem(MetaItem::Term("Debug".into())),
+ NestedMetaItem::MetaItem(MetaItem::Term("Clone".into())),
].into(),
}.into();
@@ -322,7 +322,7 @@
span: Default::default(),
},
}.into(),
- MetaItem::Word("must_use".into()),
+ MetaItem::Term("must_use".into()),
];
let actual_meta_items: Vec<_> = actual.attrs.into_iter().map(|attr| attr.meta_item().unwrap()).collect();
diff --git a/tests/test_grouping.rs b/tests/test_grouping.rs
index 59ed454..b8e67dd 100644
--- a/tests/test_grouping.rs
+++ b/tests/test_grouping.rs
@@ -9,7 +9,7 @@
extern crate proc_macro2;
use proc_macro2::*;
-fn tt(k: TokenKind) -> TokenTree {
+fn tt(k: TokenNode) -> TokenTree {
TokenTree {
span: Span::default(),
kind: k,
@@ -30,15 +30,15 @@
#[test]
fn test_grouping() {
let raw: TokenStream = vec![
- tt(TokenKind::Literal(Literal::from(1))),
- tt(TokenKind::Op('+', OpKind::Alone)),
- tt(TokenKind::Sequence(Delimiter::None, vec![
- tt(TokenKind::Literal(Literal::from(2))),
- tt(TokenKind::Op('+', OpKind::Alone)),
- tt(TokenKind::Literal(Literal::from(3))),
+ tt(TokenNode::Literal(Literal::from(1))),
+ tt(TokenNode::Op('+', Spacing::Alone)),
+ tt(TokenNode::Group(Delimiter::None, vec![
+ tt(TokenNode::Literal(Literal::from(2))),
+ tt(TokenNode::Op('+', Spacing::Alone)),
+ tt(TokenNode::Literal(Literal::from(3))),
].into_iter().collect())),
- tt(TokenKind::Op('*', OpKind::Alone)),
- tt(TokenKind::Literal(Literal::from(4))),
+ tt(TokenNode::Op('*', Spacing::Alone)),
+ tt(TokenNode::Literal(Literal::from(4))),
].into_iter().collect();
assert_eq!(raw.to_string(), "1i32 + 2i32 + 3i32 * 4i32");
@@ -64,15 +64,15 @@
#[test]
fn test_invalid_grouping() {
let raw: TokenStream = vec![
- tt(TokenKind::Literal(Literal::from(1))),
- tt(TokenKind::Op('+', OpKind::Alone)),
- tt(TokenKind::Sequence(Delimiter::None, vec![
- tt(TokenKind::Literal(Literal::from(2))),
- tt(TokenKind::Op('+', OpKind::Alone)),
+ tt(TokenNode::Literal(Literal::from(1))),
+ tt(TokenNode::Op('+', Spacing::Alone)),
+ tt(TokenNode::Group(Delimiter::None, vec![
+ tt(TokenNode::Literal(Literal::from(2))),
+ tt(TokenNode::Op('+', Spacing::Alone)),
].into_iter().collect())),
- tt(TokenKind::Literal(Literal::from(3))),
- tt(TokenKind::Op('*', OpKind::Alone)),
- tt(TokenKind::Literal(Literal::from(4))),
+ tt(TokenNode::Literal(Literal::from(3))),
+ tt(TokenNode::Op('*', Spacing::Alone)),
+ tt(TokenNode::Literal(Literal::from(4))),
].into_iter().collect();
assert_eq!(raw.to_string(), "1i32 + 2i32 + 3i32 * 4i32");
diff --git a/tests/test_meta_item.rs b/tests/test_meta_item.rs
index cc33602..14b2127 100644
--- a/tests/test_meta_item.rs
+++ b/tests/test_meta_item.rs
@@ -17,7 +17,7 @@
#[test]
fn test_meta_item_word() {
- run_test("#[foo]", MetaItem::Word("foo".into()))
+ run_test("#[foo]", MetaItem::Term("foo".into()))
}
#[test]
@@ -46,7 +46,7 @@
ident: "foo".into(),
paren_token: Default::default(),
nested: vec![
- NestedMetaItem::MetaItem(MetaItem::Word("bar".into())),
+ NestedMetaItem::MetaItem(MetaItem::Term("bar".into())),
].into(),
})
}
@@ -72,7 +72,7 @@
ident: "foo".into(),
paren_token: Default::default(),
nested: vec![
- NestedMetaItem::MetaItem(MetaItem::Word("word".into())),
+ NestedMetaItem::MetaItem(MetaItem::Term("word".into())),
NestedMetaItem::MetaItem(MetaNameValue {
ident: "name".into(),
eq_token: Default::default(),
@@ -89,7 +89,7 @@
}.into())
].into(),
}.into()),
- NestedMetaItem::MetaItem(MetaItem::Word("word2".into())),
+ NestedMetaItem::MetaItem(MetaItem::Term("word2".into())),
].into(),
})
}
diff --git a/tests/test_token_trees.rs b/tests/test_token_trees.rs
index aa545c2..7e43ea5 100644
--- a/tests/test_token_trees.rs
+++ b/tests/test_token_trees.rs
@@ -6,34 +6,34 @@
extern crate proc_macro2;
use syn::{Lit, TokenTree};
-use proc_macro2::{TokenKind, OpKind, Delimiter, TokenStream};
+use proc_macro2::{TokenNode, Spacing, Delimiter, TokenStream};
use proc_macro2::Delimiter::*;
fn alone(c: char) -> TokenTree {
TokenTree(proc_macro2::TokenTree {
span: Default::default(),
- kind: TokenKind::Op(c, OpKind::Alone),
+ kind: TokenNode::Op(c, Spacing::Alone),
})
}
fn joint(c: char) -> TokenTree {
TokenTree(proc_macro2::TokenTree {
span: Default::default(),
- kind: TokenKind::Op(c, OpKind::Joint),
+ kind: TokenNode::Op(c, Spacing::Joint),
})
}
fn delimited(delim: Delimiter, tokens: Vec<TokenTree>) -> TokenTree {
TokenTree(proc_macro2::TokenTree {
span: Default::default(),
- kind: TokenKind::Sequence(delim, tokens.into_iter().map(|t| t.0).collect()),
+ kind: TokenNode::Group(delim, tokens.into_iter().map(|t| t.0).collect()),
})
}
fn word(sym: &str) -> TokenTree {
TokenTree(proc_macro2::TokenTree {
span: Default::default(),
- kind: TokenKind::Word(sym.into()),
+ kind: TokenNode::Term(sym.into()),
})
}