aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_mbe/src/mbe_expander/matcher.rs
diff options
context:
space:
mode:
Diffstat (limited to 'crates/ra_mbe/src/mbe_expander/matcher.rs')
-rw-r--r--crates/ra_mbe/src/mbe_expander/matcher.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/crates/ra_mbe/src/mbe_expander/matcher.rs b/crates/ra_mbe/src/mbe_expander/matcher.rs
index 933a3a3b5..c752804b2 100644
--- a/crates/ra_mbe/src/mbe_expander/matcher.rs
+++ b/crates/ra_mbe/src/mbe_expander/matcher.rs
@@ -9,7 +9,7 @@ use crate::{
9}; 9};
10 10
11use super::ExpandResult; 11use super::ExpandResult;
12use ra_parser::{FragmentKind::*, TreeSink}; 12use parser::{FragmentKind::*, TreeSink};
13use ra_syntax::{SmolStr, SyntaxKind}; 13use ra_syntax::{SmolStr, SyntaxKind};
14use tt::buffer::{Cursor, TokenBuffer}; 14use tt::buffer::{Cursor, TokenBuffer};
15 15
@@ -285,7 +285,7 @@ impl<'a> TtIter<'a> {
285 285
286 pub(crate) fn expect_fragment( 286 pub(crate) fn expect_fragment(
287 &mut self, 287 &mut self,
288 fragment_kind: ra_parser::FragmentKind, 288 fragment_kind: parser::FragmentKind,
289 ) -> ExpandResult<Option<tt::TokenTree>> { 289 ) -> ExpandResult<Option<tt::TokenTree>> {
290 pub(crate) struct OffsetTokenSink<'a> { 290 pub(crate) struct OffsetTokenSink<'a> {
291 pub(crate) cursor: Cursor<'a>, 291 pub(crate) cursor: Cursor<'a>,
@@ -303,7 +303,7 @@ impl<'a> TtIter<'a> {
303 } 303 }
304 fn start_node(&mut self, _kind: SyntaxKind) {} 304 fn start_node(&mut self, _kind: SyntaxKind) {}
305 fn finish_node(&mut self) {} 305 fn finish_node(&mut self) {}
306 fn error(&mut self, _error: ra_parser::ParseError) { 306 fn error(&mut self, _error: parser::ParseError) {
307 self.error = true; 307 self.error = true;
308 } 308 }
309 } 309 }
@@ -312,7 +312,7 @@ impl<'a> TtIter<'a> {
312 let mut src = SubtreeTokenSource::new(&buffer); 312 let mut src = SubtreeTokenSource::new(&buffer);
313 let mut sink = OffsetTokenSink { cursor: buffer.begin(), error: false }; 313 let mut sink = OffsetTokenSink { cursor: buffer.begin(), error: false };
314 314
315 ra_parser::parse_fragment(&mut src, &mut sink, fragment_kind); 315 parser::parse_fragment(&mut src, &mut sink, fragment_kind);
316 316
317 let mut err = None; 317 let mut err = None;
318 if !sink.cursor.is_root() || sink.error { 318 if !sink.cursor.is_root() || sink.error {