fix tests

crates/ra_hir/src/db.rs

@@ -1,7 +1,7 @@
 use std::sync::Arc;
 
 use ra_syntax::{SyntaxNode, SourceFileNode};
-use ra_db::{SourceRootId, LocationIntener, SyntaxDatabase, FileId, Cancelable};
+use ra_db::{SourceRootId, LocationIntener, SyntaxDatabase, Cancelable};
 
 use crate::{
     DefLoc, DefId, Name, MFileId,

crates/ra_hir/src/mock.rs

@@ -189,6 +189,7 @@ impl ra_db::SyntaxDatabase {
             fn file_lines() for ra_db::FileLinesQuery;
         }
         impl db::HirDatabase {
+            fn m_source_file() for db::MSourceFileQuery;
             fn expand_macro_invocation() for db::ExpandMacroCallQuery;
             fn module_tree() for db::ModuleTreeQuery;
             fn fn_scopes() for db::FnScopesQuery;

crates/ra_hir/src/module/nameres.rs

@@ -31,7 +31,7 @@
     Path, PathKind,
     HirDatabase, Crate,
     Name, AsName,
-    macros::{MacroCallId, MacroCallLoc},
+    macros::MacroCallLoc,
     module::{Module, ModuleId, ModuleTree},
 };