rename hir_def -> hir_expand

crates/ra_hir/src/db.rs

@@ -23,7 +23,7 @@ use crate::{
     Static, Struct, StructField, Trait, TypeAlias,
 };
 
-pub use hir_def::db::{
+pub use hir_expand::db::{
     AstDatabase, AstDatabaseStorage, AstIdMapQuery, MacroArgQuery, MacroDefQuery, MacroExpandQuery,
     ParseMacroQuery,
 };

crates/ra_hir/src/ids.rs

@@ -15,7 +15,7 @@ use crate::{
     AstId, FileAstId, Module, Source,
 };
 
-pub use hir_def::expand::{
+pub use hir_expand::expand::{
     HirFileId, MacroCallId, MacroCallLoc, MacroDefId, MacroFile, MacroFileKind,
 };
 

crates/ra_hir/src/source_id.rs

@@ -1,6 +1,6 @@
 //! FIXME: write short doc here
 
-pub use hir_def::{
+pub use hir_expand::{
     ast_id_map::{AstIdMap, ErasedFileAstId, FileAstId},
     expand::AstId,
 };