diff options
author | Aleksey Kladov <[email protected]> | 2018-12-06 17:49:36 +0000 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2018-12-06 17:49:36 +0000 |
commit | 1761a7d213664cd00f7616ba3447a207eeababe9 (patch) | |
tree | 6dc2eeb8a5431f08e5ddcdfc235fc175165c4f96 | |
parent | 49324ee5669c5aad2b43a04d9d2c877b989ddc46 (diff) |
modernize some files
-rw-r--r-- | crates/ra_syntax/Cargo.toml | 2 | ||||
-rw-r--r-- | crates/ra_syntax/src/lib.rs | 9 | ||||
-rw-r--r-- | crates/ra_syntax/src/parser_api.rs | 3 |
3 files changed, 4 insertions, 10 deletions
diff --git a/crates/ra_syntax/Cargo.toml b/crates/ra_syntax/Cargo.toml index 54ee72386..8ad8ed196 100644 --- a/crates/ra_syntax/Cargo.toml +++ b/crates/ra_syntax/Cargo.toml | |||
@@ -1,5 +1,5 @@ | |||
1 | [package] | 1 | [package] |
2 | edition = "2015" | 2 | edition = "2018" |
3 | name = "ra_syntax" | 3 | name = "ra_syntax" |
4 | version = "0.1.0" | 4 | version = "0.1.0" |
5 | authors = ["Aleksey Kladov <[email protected]>"] | 5 | authors = ["Aleksey Kladov <[email protected]>"] |
diff --git a/crates/ra_syntax/src/lib.rs b/crates/ra_syntax/src/lib.rs index 330f68053..56c61ae5d 100644 --- a/crates/ra_syntax/src/lib.rs +++ b/crates/ra_syntax/src/lib.rs | |||
@@ -20,13 +20,6 @@ | |||
20 | #![allow(missing_docs)] | 20 | #![allow(missing_docs)] |
21 | //#![warn(unreachable_pub)] // rust-lang/rust#47816 | 21 | //#![warn(unreachable_pub)] // rust-lang/rust#47816 |
22 | 22 | ||
23 | extern crate arrayvec; | ||
24 | extern crate drop_bomb; | ||
25 | extern crate itertools; | ||
26 | extern crate parking_lot; | ||
27 | extern crate rowan; | ||
28 | extern crate unicode_xid; | ||
29 | |||
30 | #[cfg(test)] | 23 | #[cfg(test)] |
31 | #[macro_use] | 24 | #[macro_use] |
32 | extern crate test_utils; | 25 | extern crate test_utils; |
@@ -48,11 +41,11 @@ pub mod utils; | |||
48 | mod validation; | 41 | mod validation; |
49 | mod yellow; | 42 | mod yellow; |
50 | 43 | ||
44 | pub use rowan::{SmolStr, TextRange, TextUnit}; | ||
51 | pub use crate::{ | 45 | pub use crate::{ |
52 | ast::AstNode, | 46 | ast::AstNode, |
53 | lexer::{tokenize, Token}, | 47 | lexer::{tokenize, Token}, |
54 | reparsing::AtomEdit, | 48 | reparsing::AtomEdit, |
55 | rowan::{SmolStr, TextRange, TextUnit}, | ||
56 | syntax_kinds::SyntaxKind, | 49 | syntax_kinds::SyntaxKind, |
57 | yellow::{ | 50 | yellow::{ |
58 | Direction, OwnedRoot, RefRoot, SyntaxError, SyntaxNode, SyntaxNodeRef, TreeRoot, WalkEvent, Location, | 51 | Direction, OwnedRoot, RefRoot, SyntaxError, SyntaxNode, SyntaxNodeRef, TreeRoot, WalkEvent, Location, |
diff --git a/crates/ra_syntax/src/parser_api.rs b/crates/ra_syntax/src/parser_api.rs index 42046d36f..c37c30e34 100644 --- a/crates/ra_syntax/src/parser_api.rs +++ b/crates/ra_syntax/src/parser_api.rs | |||
@@ -1,5 +1,6 @@ | |||
1 | use drop_bomb::DropBomb; | ||
2 | |||
1 | use crate::{ | 3 | use crate::{ |
2 | drop_bomb::DropBomb, | ||
3 | parser_impl::ParserImpl, | 4 | parser_impl::ParserImpl, |
4 | token_set::TokenSet, | 5 | token_set::TokenSet, |
5 | SyntaxKind::{self, ERROR}, | 6 | SyntaxKind::{self, ERROR}, |