diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-07-04 21:09:32 +0100 |
---|---|---|
committer | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-07-04 21:09:32 +0100 |
commit | cacdb0eab8131bfb945eb7ed0150c92ec56eefe2 (patch) | |
tree | f762de90ce813591bc640ae0bce36493a3dcafa9 /crates/ra_mbe/src/syntax_bridge.rs | |
parent | 4e8664d9d37021e85d72b6228fa45e7edf4a1a74 (diff) | |
parent | 1834bae5b86c54ed9dece26e82436919d59e6cb7 (diff) |
Merge #1486
1486: allow rustfmt to reorder imports r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_mbe/src/syntax_bridge.rs')
-rw-r--r-- | crates/ra_mbe/src/syntax_bridge.rs | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/crates/ra_mbe/src/syntax_bridge.rs b/crates/ra_mbe/src/syntax_bridge.rs index cb039ca37..b91b0e7a5 100644 --- a/crates/ra_mbe/src/syntax_bridge.rs +++ b/crates/ra_mbe/src/syntax_bridge.rs | |||
@@ -1,11 +1,11 @@ | |||
1 | use ra_parser::{TreeSink, ParseError}; | 1 | use crate::subtree_source::SubtreeTokenSource; |
2 | use crate::ExpandError; | ||
3 | use ra_parser::{ParseError, TreeSink}; | ||
2 | use ra_syntax::{ | 4 | use ra_syntax::{ |
3 | AstNode, SyntaxNode, TextRange, SyntaxKind, SmolStr, SyntaxTreeBuilder, TreeArc, SyntaxElement, | 5 | ast, AstNode, SmolStr, SyntaxElement, SyntaxKind, SyntaxKind::*, SyntaxNode, SyntaxTreeBuilder, |
4 | ast, SyntaxKind::*, TextUnit, T | 6 | TextRange, TextUnit, TreeArc, T, |
5 | }; | 7 | }; |
6 | use tt::buffer::{TokenBuffer, Cursor}; | 8 | use tt::buffer::{Cursor, TokenBuffer}; |
7 | use crate::subtree_source::{SubtreeTokenSource}; | ||
8 | use crate::ExpandError; | ||
9 | 9 | ||
10 | /// Maps `tt::TokenId` to the relative range of the original token. | 10 | /// Maps `tt::TokenId` to the relative range of the original token. |
11 | #[derive(Default)] | 11 | #[derive(Default)] |
@@ -367,7 +367,7 @@ impl<'a> TreeSink for TtTreeSink<'a> { | |||
367 | #[cfg(test)] | 367 | #[cfg(test)] |
368 | mod tests { | 368 | mod tests { |
369 | use super::*; | 369 | use super::*; |
370 | use crate::tests::{expand, create_rules}; | 370 | use crate::tests::{create_rules, expand}; |
371 | use ra_parser::TokenSource; | 371 | use ra_parser::TokenSource; |
372 | 372 | ||
373 | #[test] | 373 | #[test] |