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_syntax/src/lib.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_syntax/src/lib.rs')
-rw-r--r-- | crates/ra_syntax/src/lib.rs | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/crates/ra_syntax/src/lib.rs b/crates/ra_syntax/src/lib.rs index e46ad12db..9790a984d 100644 --- a/crates/ra_syntax/src/lib.rs +++ b/crates/ra_syntax/src/lib.rs | |||
@@ -31,23 +31,26 @@ pub mod ast; | |||
31 | #[doc(hidden)] | 31 | #[doc(hidden)] |
32 | pub mod fuzz; | 32 | pub mod fuzz; |
33 | 33 | ||
34 | use std::{sync::Arc, fmt::Write}; | 34 | use std::{fmt::Write, sync::Arc}; |
35 | 35 | ||
36 | use ra_text_edit::AtomTextEdit; | 36 | use ra_text_edit::AtomTextEdit; |
37 | 37 | ||
38 | use crate::syntax_node::GreenNode; | 38 | use crate::syntax_node::GreenNode; |
39 | 39 | ||
40 | pub use rowan::{SmolStr, TextRange, TextUnit}; | ||
41 | pub use ra_parser::SyntaxKind; | ||
42 | pub use ra_parser::T; | ||
43 | pub use crate::{ | 40 | pub use crate::{ |
44 | ast::AstNode, | 41 | ast::AstNode, |
45 | syntax_error::{SyntaxError, SyntaxErrorKind, Location}, | 42 | parsing::{classify_literal, tokenize, Token}, |
43 | ptr::{AstPtr, SyntaxNodePtr}, | ||
44 | syntax_error::{Location, SyntaxError, SyntaxErrorKind}, | ||
45 | syntax_node::{ | ||
46 | Direction, InsertPosition, SyntaxElement, SyntaxNode, SyntaxToken, SyntaxTreeBuilder, | ||
47 | TreeArc, WalkEvent, | ||
48 | }, | ||
46 | syntax_text::SyntaxText, | 49 | syntax_text::SyntaxText, |
47 | syntax_node::{Direction, SyntaxNode, WalkEvent, TreeArc, SyntaxTreeBuilder, SyntaxElement, SyntaxToken, InsertPosition}, | ||
48 | ptr::{SyntaxNodePtr, AstPtr}, | ||
49 | parsing::{tokenize, classify_literal, Token}, | ||
50 | }; | 50 | }; |
51 | pub use ra_parser::SyntaxKind; | ||
52 | pub use ra_parser::T; | ||
53 | pub use rowan::{SmolStr, TextRange, TextUnit}; | ||
51 | 54 | ||
52 | /// `Parse` is the result of the parsing: a syntax tree and a collection of | 55 | /// `Parse` is the result of the parsing: a syntax tree and a collection of |
53 | /// errors. | 56 | /// errors. |