4 files changed, 8 insertions, 18 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 @@
 [package]
-edition = "2015"
+edition = "2018"
 name = "ra_syntax"
 version = "0.1.0"
 authors = ["Aleksey Kladov <[email protected]>"]
diff --git a/crates/ra_syntax/src/lib.rs b/crates/ra_syntax/src/lib.rs
index 330f68053..0e5c9baad 100644
--- a/crates/ra_syntax/src/lib.rs
+++ b/crates/ra_syntax/src/lib.rs
@@ -20,17 +20,6 @@
 #![allow(missing_docs)]
 //#![warn(unreachable_pub)] // rust-lang/rust#47816
 
-extern crate arrayvec;
-extern crate drop_bomb;
-extern crate itertools;
-extern crate parking_lot;
-extern crate rowan;
-extern crate unicode_xid;
-
-#[cfg(test)]
-#[macro_use]
-extern crate test_utils;
-
 pub mod algo;
 pub mod ast;
 mod lexer;
@@ -48,11 +37,11 @@ pub mod utils;
 mod validation;
 mod yellow;
 
+pub use rowan::{SmolStr, TextRange, TextUnit};
 pub use crate::{
     ast::AstNode,
     lexer::{tokenize, Token},
     reparsing::AtomEdit,
-    rowan::{SmolStr, TextRange, TextUnit},
     syntax_kinds::SyntaxKind,
     yellow::{
         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 @@
+use drop_bomb::DropBomb;
+
 use crate::{
-    drop_bomb::DropBomb,
     parser_impl::ParserImpl,
     token_set::TokenSet,
     SyntaxKind::{self, ERROR},
diff --git a/crates/ra_syntax/src/reparsing.rs b/crates/ra_syntax/src/reparsing.rs
index ddcb8f6f6..732fb0e4a 100644
--- a/crates/ra_syntax/src/reparsing.rs
+++ b/crates/ra_syntax/src/reparsing.rs
@@ -179,10 +179,10 @@ fn merge_errors(
 
 #[cfg(test)]
 mod tests {
-    use super::{
-        super::{test_utils::extract_range, text_utils::replace_range, utils::dump_tree, SourceFileNode},
-        reparse_block, reparse_leaf, AtomEdit, GreenNode, SyntaxError, SyntaxNodeRef,
-};
+    use test_utils::{extract_range, assert_eq_text};
+
+    use crate::{SourceFileNode, text_utils::replace_range, utils::dump_tree };
+    use super::*;
 
     fn do_check<F>(before: &str, replace_with: &str, reparser: F)
     where