diff options
Diffstat (limited to 'crates/ra_ssr/src/matching.rs')
-rw-r--r-- | crates/ra_ssr/src/matching.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crates/ra_ssr/src/matching.rs b/crates/ra_ssr/src/matching.rs index 0f72fea69..125bf3895 100644 --- a/crates/ra_ssr/src/matching.rs +++ b/crates/ra_ssr/src/matching.rs | |||
@@ -8,10 +8,10 @@ use crate::{ | |||
8 | }; | 8 | }; |
9 | use hir::Semantics; | 9 | use hir::Semantics; |
10 | use ra_db::FileRange; | 10 | use ra_db::FileRange; |
11 | use ra_syntax::ast::{AstNode, AstToken}; | ||
12 | use ra_syntax::{ast, SyntaxElement, SyntaxElementChildren, SyntaxKind, SyntaxNode, SyntaxToken}; | ||
13 | use rustc_hash::FxHashMap; | 11 | use rustc_hash::FxHashMap; |
14 | use std::{cell::Cell, iter::Peekable}; | 12 | use std::{cell::Cell, iter::Peekable}; |
13 | use syntax::ast::{AstNode, AstToken}; | ||
14 | use syntax::{ast, SyntaxElement, SyntaxElementChildren, SyntaxKind, SyntaxNode, SyntaxToken}; | ||
15 | use test_utils::mark; | 15 | use test_utils::mark; |
16 | 16 | ||
17 | // Creates a match error. If we're currently attempting to match some code that we thought we were | 17 | // Creates a match error. If we're currently attempting to match some code that we thought we were |
@@ -264,7 +264,7 @@ impl<'db, 'sema> Matcher<'db, 'sema> { | |||
264 | &self, | 264 | &self, |
265 | phase: &mut Phase, | 265 | phase: &mut Phase, |
266 | pattern: &mut Peekable<PatternIterator>, | 266 | pattern: &mut Peekable<PatternIterator>, |
267 | code: &ra_syntax::SyntaxToken, | 267 | code: &syntax::SyntaxToken, |
268 | ) -> Result<(), MatchFailed> { | 268 | ) -> Result<(), MatchFailed> { |
269 | phase.record_ignored_comments(code); | 269 | phase.record_ignored_comments(code); |
270 | // Ignore whitespace and comments. | 270 | // Ignore whitespace and comments. |
@@ -444,7 +444,7 @@ impl<'db, 'sema> Matcher<'db, 'sema> { | |||
444 | &self, | 444 | &self, |
445 | phase: &mut Phase, | 445 | phase: &mut Phase, |
446 | pattern: &SyntaxNode, | 446 | pattern: &SyntaxNode, |
447 | code: &ra_syntax::SyntaxNode, | 447 | code: &syntax::SyntaxNode, |
448 | ) -> Result<(), MatchFailed> { | 448 | ) -> Result<(), MatchFailed> { |
449 | let mut pattern = PatternIterator::new(pattern).peekable(); | 449 | let mut pattern = PatternIterator::new(pattern).peekable(); |
450 | let mut children = code.children_with_tokens(); | 450 | let mut children = code.children_with_tokens(); |