remove dead code

Author: matklad

crates/ra_mbe/src/lib.rs

@@ -3,28 +3,13 @@
 /// interface, although it contains some code to bridge `SyntaxNode`s and
 /// `TokenTree`s as well!
 
-macro_rules! impl_froms {
-    ($e:ident: $($v:ident), *) => {
-        $(
-            impl From<$v> for $e {
-                fn from(it: $v) -> $e {
-                    $e::$v(it)
-                }
-            }
-        )*
-    }
-}
-
 mod parser;
 mod mbe_parser;
 mod mbe_expander;
 mod syntax_bridge;
-mod tt_cursor;
 mod tt_iter;
 mod subtree_source;
-mod subtree_parser;
 
-use ra_syntax::SmolStr;
 use smallvec::SmallVec;
 
 pub use tt::{Delimiter, Punct};
@@ -72,29 +57,6 @@ pub(crate) struct Rule {
     pub(crate) rhs: tt::Subtree,
 }
 
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub(crate) enum TokenTree {
-    Leaf(Leaf),
-    Subtree(Subtree),
-    Repeat(Repeat),
-}
-impl_froms!(TokenTree: Leaf, Subtree, Repeat);
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub(crate) enum Leaf {
-    Literal(Literal),
-    Punct(Punct),
-    Ident(Ident),
-    Var(Var),
-}
-impl_froms!(Leaf: Literal, Punct, Ident, Var);
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub(crate) struct Subtree {
-    pub(crate) delimiter: Delimiter,
-    pub(crate) token_trees: Vec<TokenTree>,
-}
-
 #[derive(Clone, Debug, Eq)]
 pub(crate) enum Separator {
     Literal(tt::Literal),
@@ -120,27 +82,5 @@ impl PartialEq for crate::Separator {
     }
 }
 
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub(crate) struct Repeat {
-    pub(crate) subtree: Subtree,
-    pub(crate) separator: Option<Separator>,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub(crate) struct Literal {
-    pub(crate) text: SmolStr,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub(crate) struct Ident {
-    pub(crate) text: SmolStr,
-}
-
-#[derive(Clone, Debug, PartialEq, Eq)]
-pub(crate) struct Var {
-    pub(crate) text: SmolStr,
-    pub(crate) kind: Option<SmolStr>,
-}
-
 #[cfg(test)]
 mod tests;

crates/ra_mbe/src/mbe_expander/matcher.rs

@@ -1,15 +1,14 @@
 use crate::{
     mbe_expander::{Binding, Bindings, Fragment},
     parser::{parse_pattern, Op, RepeatKind},
-    subtree_parser::OffsetTokenSink,
     subtree_source::SubtreeTokenSource,
     tt_iter::TtIter,
     ExpandError, Separator,
 };
 
-use ra_parser::FragmentKind::*;
-use ra_syntax::SmolStr;
-use tt::buffer::TokenBuffer;
+use ra_parser::{FragmentKind::*, TreeSink};
+use ra_syntax::{SmolStr, SyntaxKind};
+use tt::buffer::{Cursor, TokenBuffer};
 
 impl Bindings {
     fn push_optional(&mut self, name: &SmolStr) {
@@ -168,6 +167,24 @@ impl<'a> TtIter<'a> {
         &mut self,
         fragment_kind: ra_parser::FragmentKind,
     ) -> Result<tt::TokenTree, ()> {
+        pub(crate) struct OffsetTokenSink<'a> {
+            pub(crate) cursor: Cursor<'a>,
+            pub(crate) error: bool,
+        }
+
+        impl<'a> TreeSink for OffsetTokenSink<'a> {
+            fn token(&mut self, _kind: SyntaxKind, n_tokens: u8) {
+                for _ in 0..n_tokens {
+                    self.cursor = self.cursor.bump_subtree();
+                }
+            }
+            fn start_node(&mut self, _kind: SyntaxKind) {}
+            fn finish_node(&mut self) {}
+            fn error(&mut self, _error: ra_parser::ParseError) {
+                self.error = true;
+            }
+        }
+
         let buffer = TokenBuffer::new(self.inner.as_slice());
         let mut src = SubtreeTokenSource::new(&buffer);
         let mut sink = OffsetTokenSink { cursor: buffer.begin(), error: false };