diff --git a/crates/hir-def/src/nameres/collector.rs b/crates/hir-def/src/nameres/collector.rs
index acdf5022c5..481e8a4cb4 100644
--- a/crates/hir-def/src/nameres/collector.rs
+++ b/crates/hir-def/src/nameres/collector.rs
@@ -17,8 +17,6 @@ use crate::macro_call_as_call_id_with_eager;
 use crate::nameres::mod_resolution::ModDir;
 
 use crate::item_tree::ItemTree;
-use base_db::{CrateId, Dependency, FileId};
-use cfg::{CfgExpr, CfgOptions};
 
 use crate::item_tree::TreeId;
 
diff --git a/crates/hir-expand/src/db.rs b/crates/hir-expand/src/db.rs
index 163f05bdab..004c447301 100644
--- a/crates/hir-expand/src/db.rs
+++ b/crates/hir-expand/src/db.rs
@@ -340,7 +340,7 @@ pub(crate) fn parse_with_map(
     }
 }
 /// This is just to ensure the types of smart_macro_arg and macro_arg are the same
-type MacroArgResult = (Arc<tt::Subtree>, SyntaxFixupUndoInfo, Span) ;
+type MacroArgResult = (Arc<tt::Subtree>, SyntaxFixupUndoInfo, Span);
 /// Imagine the word smart in quotes.
 ///
 /// This resolves the [MacroCallId] to check if it is a derive macro if so get the [macro_arg] for the derive.
@@ -553,8 +553,7 @@ fn macro_expand(
     let (ExpandResult { value: tt, err }, span) = match loc.def.kind {
         MacroDefKind::ProcMacro(..) => return db.expand_proc_macro(macro_call_id).map(CowArc::Arc),
         _ => {
-            let (macro_arg, undo_info, span) =
-                smart_macro_arg(db, macro_call_id);
+            let (macro_arg, undo_info, span) = smart_macro_arg(db, macro_call_id);
 
             let arg = &*macro_arg;
             let res =