From 88267c86c0c49de395973574d2516ab904091cfb Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Thu, 6 Feb 2020 12:52:32 +0100
Subject: cleanup imports

---
 crates/ra_ide/src/expand_macro.rs | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

(limited to 'crates/ra_ide/src/expand_macro.rs')

diff --git a/crates/ra_ide/src/expand_macro.rs b/crates/ra_ide/src/expand_macro.rs
index 0f7b6e875..af2783bef 100644
--- a/crates/ra_ide/src/expand_macro.rs
+++ b/crates/ra_ide/src/expand_macro.rs
@@ -1,14 +1,15 @@
 //! This modules implements "expand macro" functionality in the IDE
 
-use crate::{db::RootDatabase, FilePosition};
 use hir::db::AstDatabase;
 use ra_db::SourceDatabase;
-use rustc_hash::FxHashMap;
-
+use ra_ide_db::RootDatabase;
 use ra_syntax::{
     algo::{find_node_at_offset, replace_descendants},
     ast, AstNode, NodeOrToken, SyntaxElement, SyntaxKind, SyntaxNode, WalkEvent, T,
 };
+use rustc_hash::FxHashMap;
+
+use crate::FilePosition;
 
 pub struct ExpandedMacro {
     pub name: String,
@@ -185,7 +186,7 @@ fn some_thing() -> u32 {
         //- /lib.rs
         macro_rules! match_ast {
             (match $node:ident { $($tt:tt)* }) => { match_ast!(match ($node) { $($tt)* }) };
-        
+
             (match ($node:expr) {
                 $( ast::$ast:ident($it:ident) => $res:block, )*
                 _ => $catch_all:expr $(,)?
@@ -193,7 +194,7 @@ fn some_thing() -> u32 {
                 $( if let Some($it) = ast::$ast::cast($node.clone()) $res else )*
                 { $catch_all }
             }};
-        }        
+        }
 
         fn main() {
             mat<|>ch_ast! {
@@ -227,11 +228,11 @@ fn some_thing() -> u32 {
             r#"
         //- /lib.rs
         macro_rules! match_ast {
-            (match $node:ident { $($tt:tt)* }) => { match_ast!(match ($node) { $($tt)* }) };        
+            (match $node:ident { $($tt:tt)* }) => { match_ast!(match ($node) { $($tt)* }) };
             (match ($node:expr) {}) => {{}};
-        }        
+        }
 
-        fn main() {        
+        fn main() {
             let p = f(|it| {
                 let res = mat<|>ch_ast! { match c {}};
                 Some(res)
@@ -254,9 +255,9 @@ fn some_thing() -> u32 {
         }
         macro_rules! foo {
             () => {bar!()};
-        }        
+        }
 
-        fn main() {        
+        fn main() {
             let res = fo<|>o!();
         }
         "#,
@@ -277,9 +278,9 @@ fn some_thing() -> u32 {
         }
         macro_rules! foo {
             () => {$crate::bar!()};
-        }        
+        }
 
-        fn main() {        
+        fn main() {
             let res = fo<|>o!();
         }
         "#,
-- 
cgit v1.2.3