Move token extra-traits helpers to tt module
diff --git a/src/attr.rs b/src/attr.rs
index 5cbdee9..375904e 100644
--- a/src/attr.rs
+++ b/src/attr.rs
@@ -8,7 +8,7 @@
#[cfg(feature = "extra-traits")]
use std::hash::{Hash, Hasher};
#[cfg(feature = "extra-traits")]
-use mac::TokenStreamHelper;
+use tt::TokenStreamHelper;
ast_struct! {
/// Doc-comments are promoted to attributes that have `is_sugared_doc` = true
diff --git a/src/expr.rs b/src/expr.rs
index 863492c..19c5172 100644
--- a/src/expr.rs
+++ b/src/expr.rs
@@ -4,7 +4,7 @@
#[cfg(feature = "extra-traits")]
use std::hash::{Hash, Hasher};
#[cfg(feature = "extra-traits")]
-use mac::TokenStreamHelper;
+use tt::TokenStreamHelper;
#[cfg(feature = "full")]
use std::mem;
@@ -691,17 +691,17 @@
}
}
-#[cfg(feature = "extra-traits")]
+#[cfg(all(feature = "full", feature = "extra-traits"))]
impl Eq for PatVerbatim {}
-#[cfg(feature = "extra-traits")]
+#[cfg(all(feature = "full", feature = "extra-traits"))]
impl PartialEq for PatVerbatim {
fn eq(&self, other: &Self) -> bool {
TokenStreamHelper(&self.tts) == TokenStreamHelper(&other.tts)
}
}
-#[cfg(feature = "extra-traits")]
+#[cfg(all(feature = "full", feature = "extra-traits"))]
impl Hash for PatVerbatim {
fn hash<H>(&self, state: &mut H)
where
diff --git a/src/item.rs b/src/item.rs
index 82712d3..3d84c28 100644
--- a/src/item.rs
+++ b/src/item.rs
@@ -4,7 +4,7 @@
use token::{Paren, Brace};
#[cfg(feature = "extra-traits")]
-use mac::TokenStreamHelper;
+use tt::TokenStreamHelper;
#[cfg(feature = "extra-traits")]
use std::hash::{Hash, Hasher};
diff --git a/src/mac.rs b/src/mac.rs
index 0f0b28d..028f6d2 100644
--- a/src/mac.rs
+++ b/src/mac.rs
@@ -3,9 +3,9 @@
use token::{Paren, Brace, Bracket};
#[cfg(feature = "extra-traits")]
-use proc_macro2::{TokenTree, TokenNode, Delimiter};
-#[cfg(feature = "extra-traits")]
use std::hash::{Hash, Hasher};
+#[cfg(feature = "extra-traits")]
+use tt::TokenStreamHelper;
ast_struct! {
/// Represents a macro invocation. The Path indicates which macro is being
@@ -55,118 +55,6 @@
}
}
-#[cfg(feature = "extra-traits")]
-pub struct TokenTreeHelper<'a>(pub &'a TokenTree);
-
-#[cfg(feature = "extra-traits")]
-impl<'a> PartialEq for TokenTreeHelper<'a> {
- fn eq(&self, other: &Self) -> bool {
- use proc_macro2::Spacing;
-
- match (&self.0.kind, &other.0.kind) {
- (&TokenNode::Group(d1, ref s1), &TokenNode::Group(d2, ref s2)) => {
- match (d1, d2) {
- (Delimiter::Parenthesis, Delimiter::Parenthesis)
- | (Delimiter::Brace, Delimiter::Brace)
- | (Delimiter::Bracket, Delimiter::Bracket)
- | (Delimiter::None, Delimiter::None) => {}
- _ => return false,
- }
-
- let s1 = s1.clone().into_iter();
- let mut s2 = s2.clone().into_iter();
-
- for item1 in s1 {
- let item2 = match s2.next() {
- Some(item) => item,
- None => return false,
- };
- if TokenTreeHelper(&item1) != TokenTreeHelper(&item2) {
- return false;
- }
- }
- s2.next().is_none()
- }
- (&TokenNode::Op(o1, k1), &TokenNode::Op(o2, k2)) => {
- o1 == o2 && match (k1, k2) {
- (Spacing::Alone, Spacing::Alone) | (Spacing::Joint, Spacing::Joint) => true,
- _ => false,
- }
- }
- (&TokenNode::Literal(ref l1), &TokenNode::Literal(ref l2)) => {
- l1.to_string() == l2.to_string()
- }
- (&TokenNode::Term(ref s1), &TokenNode::Term(ref s2)) => s1.as_str() == s2.as_str(),
- _ => false,
- }
- }
-}
-
-#[cfg(feature = "extra-traits")]
-impl<'a> Hash for TokenTreeHelper<'a> {
- fn hash<H: Hasher>(&self, h: &mut H) {
- use proc_macro2::Spacing;
-
- match self.0.kind {
- TokenNode::Group(delim, ref stream) => {
- 0u8.hash(h);
- match delim {
- Delimiter::Parenthesis => 0u8.hash(h),
- Delimiter::Brace => 1u8.hash(h),
- Delimiter::Bracket => 2u8.hash(h),
- Delimiter::None => 3u8.hash(h),
- }
-
- for item in stream.clone() {
- TokenTreeHelper(&item).hash(h);
- }
- 0xffu8.hash(h); // terminator w/ a variant we don't normally hash
- }
- TokenNode::Op(op, kind) => {
- 1u8.hash(h);
- op.hash(h);
- match kind {
- Spacing::Alone => 0u8.hash(h),
- Spacing::Joint => 1u8.hash(h),
- }
- }
- TokenNode::Literal(ref lit) => (2u8, lit.to_string()).hash(h),
- TokenNode::Term(ref word) => (3u8, word.as_str()).hash(h),
- }
- }
-}
-
-#[cfg(feature = "extra-traits")]
-pub struct TokenStreamHelper<'a>(pub &'a TokenStream);
-
-#[cfg(feature = "extra-traits")]
-impl<'a> PartialEq for TokenStreamHelper<'a> {
- fn eq(&self, other: &Self) -> bool {
- let left = self.0.clone().into_iter().collect::<Vec<_>>();
- let right = other.0.clone().into_iter().collect::<Vec<_>>();
- if left.len() != right.len() {
- return false;
- }
- for (a, b) in left.into_iter().zip(right) {
- if TokenTreeHelper(&a) != TokenTreeHelper(&b) {
- return false;
- }
- }
- true
- }
-}
-
-#[cfg(feature = "extra-traits")]
-impl<'a> Hash for TokenStreamHelper<'a> {
- fn hash<H: Hasher>(&self, state: &mut H) {
- let tts = self.0.clone().into_iter().collect::<Vec<_>>();
- tts.len().hash(state);
- for tt in tts {
- TokenTreeHelper(&tt).hash(state);
- }
- }
-}
-
#[cfg(feature = "parsing")]
pub mod parsing {
use super::*;
diff --git a/src/tt.rs b/src/tt.rs
index b0952a0..d8d497b 100644
--- a/src/tt.rs
+++ b/src/tt.rs
@@ -5,6 +5,9 @@
use MacroDelimiter;
use token::{Paren, Brace, Bracket};
+#[cfg(feature = "extra-traits")]
+use std::hash::{Hash, Hasher};
+
pub fn delimited(input: Cursor) -> PResult<(MacroDelimiter, TokenStream)> {
match input.token_tree() {
Some((
@@ -53,3 +56,115 @@
_ => parse_error(),
}
}
+
+#[cfg(feature = "extra-traits")]
+pub struct TokenTreeHelper<'a>(pub &'a TokenTree);
+
+#[cfg(feature = "extra-traits")]
+impl<'a> PartialEq for TokenTreeHelper<'a> {
+ fn eq(&self, other: &Self) -> bool {
+ use proc_macro2::Spacing;
+
+ match (&self.0.kind, &other.0.kind) {
+ (&TokenNode::Group(d1, ref s1), &TokenNode::Group(d2, ref s2)) => {
+ match (d1, d2) {
+ (Delimiter::Parenthesis, Delimiter::Parenthesis)
+ | (Delimiter::Brace, Delimiter::Brace)
+ | (Delimiter::Bracket, Delimiter::Bracket)
+ | (Delimiter::None, Delimiter::None) => {}
+ _ => return false,
+ }
+
+ let s1 = s1.clone().into_iter();
+ let mut s2 = s2.clone().into_iter();
+
+ for item1 in s1 {
+ let item2 = match s2.next() {
+ Some(item) => item,
+ None => return false,
+ };
+ if TokenTreeHelper(&item1) != TokenTreeHelper(&item2) {
+ return false;
+ }
+ }
+ s2.next().is_none()
+ }
+ (&TokenNode::Op(o1, k1), &TokenNode::Op(o2, k2)) => {
+ o1 == o2 && match (k1, k2) {
+ (Spacing::Alone, Spacing::Alone) | (Spacing::Joint, Spacing::Joint) => true,
+ _ => false,
+ }
+ }
+ (&TokenNode::Literal(ref l1), &TokenNode::Literal(ref l2)) => {
+ l1.to_string() == l2.to_string()
+ }
+ (&TokenNode::Term(ref s1), &TokenNode::Term(ref s2)) => s1.as_str() == s2.as_str(),
+ _ => false,
+ }
+ }
+}
+
+#[cfg(feature = "extra-traits")]
+impl<'a> Hash for TokenTreeHelper<'a> {
+ fn hash<H: Hasher>(&self, h: &mut H) {
+ use proc_macro2::Spacing;
+
+ match self.0.kind {
+ TokenNode::Group(delim, ref stream) => {
+ 0u8.hash(h);
+ match delim {
+ Delimiter::Parenthesis => 0u8.hash(h),
+ Delimiter::Brace => 1u8.hash(h),
+ Delimiter::Bracket => 2u8.hash(h),
+ Delimiter::None => 3u8.hash(h),
+ }
+
+ for item in stream.clone() {
+ TokenTreeHelper(&item).hash(h);
+ }
+ 0xffu8.hash(h); // terminator w/ a variant we don't normally hash
+ }
+ TokenNode::Op(op, kind) => {
+ 1u8.hash(h);
+ op.hash(h);
+ match kind {
+ Spacing::Alone => 0u8.hash(h),
+ Spacing::Joint => 1u8.hash(h),
+ }
+ }
+ TokenNode::Literal(ref lit) => (2u8, lit.to_string()).hash(h),
+ TokenNode::Term(ref word) => (3u8, word.as_str()).hash(h),
+ }
+ }
+}
+
+#[cfg(feature = "extra-traits")]
+pub struct TokenStreamHelper<'a>(pub &'a TokenStream);
+
+#[cfg(feature = "extra-traits")]
+impl<'a> PartialEq for TokenStreamHelper<'a> {
+ fn eq(&self, other: &Self) -> bool {
+ let left = self.0.clone().into_iter().collect::<Vec<_>>();
+ let right = other.0.clone().into_iter().collect::<Vec<_>>();
+ if left.len() != right.len() {
+ return false;
+ }
+ for (a, b) in left.into_iter().zip(right) {
+ if TokenTreeHelper(&a) != TokenTreeHelper(&b) {
+ return false;
+ }
+ }
+ true
+ }
+}
+
+#[cfg(feature = "extra-traits")]
+impl<'a> Hash for TokenStreamHelper<'a> {
+ fn hash<H: Hasher>(&self, state: &mut H) {
+ let tts = self.0.clone().into_iter().collect::<Vec<_>>();
+ tts.len().hash(state);
+ for tt in tts {
+ TokenTreeHelper(&tt).hash(state);
+ }
+ }
+}
diff --git a/src/ty.rs b/src/ty.rs
index 9d2fa01..f7b9011 100644
--- a/src/ty.rs
+++ b/src/ty.rs
@@ -4,7 +4,7 @@
#[cfg(feature = "extra-traits")]
use std::hash::{Hash, Hasher};
#[cfg(feature = "extra-traits")]
-use mac::TokenStreamHelper;
+use tt::TokenStreamHelper;
ast_enum_of_structs! {
/// The different kinds of types recognized by the compiler