19 files changed, 30 insertions, 31 deletions

diff --git a/Cargo.lock b/Cargo.lock
index a99dd6e04..768c3293d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -464,6 +464,23 @@ dependencies = [
 ]
 
 [[package]]
+name = "hir_expand"
+version = "0.0.0"
+dependencies = [
+ "arena",
+ "base_db",
+ "either",
+ "log",
+ "mbe",
+ "parser",
+ "profile",
+ "rustc-hash",
+ "syntax",
+ "test_utils",
+ "tt",
+]
+
+[[package]]
 name = "home"
 version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1017,11 +1034,11 @@ dependencies = [
  "arrayvec",
  "base_db",
  "either",
+ "hir_expand",
  "itertools",
  "log",
  "profile",
  "ra_hir_def",
- "ra_hir_expand",
  "ra_hir_ty",
  "rustc-hash",
  "stdx",
@@ -1040,13 +1057,13 @@ dependencies = [
  "either",
  "expect",
  "fst",
+ "hir_expand",
  "indexmap",
  "itertools",
  "log",
  "mbe",
  "once_cell",
  "profile",
- "ra_hir_expand",
  "rustc-hash",
  "smallvec",
  "stdx",
@@ -1056,23 +1073,6 @@ dependencies = [
 ]
 
 [[package]]
-name = "ra_hir_expand"
-version = "0.1.0"
-dependencies = [
- "arena",
- "base_db",
- "either",
- "log",
- "mbe",
- "parser",
- "profile",
- "rustc-hash",
- "syntax",
- "test_utils",
- "tt",
-]
-
-[[package]]
 name = "ra_hir_ty"
 version = "0.1.0"
 dependencies = [
@@ -1084,11 +1084,11 @@ dependencies = [
  "chalk-solve",
  "ena",
  "expect",
+ "hir_expand",
  "itertools",
  "log",
  "profile",
  "ra_hir_def",
- "ra_hir_expand",
  "rustc-hash",
  "scoped-tls",
  "smallvec",
diff --git a/crates/ra_hir_expand/Cargo.toml b/crates/hir_expand/Cargo.toml
index 41acf3712..1c4699291 100644
--- a/crates/ra_hir_expand/Cargo.toml
+++ b/crates/hir_expand/Cargo.toml
@@ -1,9 +1,9 @@
 [package]
-edition = "2018"
-name = "ra_hir_expand"
-version = "0.1.0"
-authors = ["rust-analyzer developers"]
+name = "hir_expand"
+version = "0.0.0"
 license = "MIT OR Apache-2.0"
+authors = ["rust-analyzer developers"]
+edition = "2018"
 
 [lib]
 doctest = false
diff --git a/crates/ra_hir_expand/src/ast_id_map.rs b/crates/hir_expand/src/ast_id_map.rs
index f63629b30..f63629b30 100644
--- a/crates/ra_hir_expand/src/ast_id_map.rs
+++ b/crates/hir_expand/src/ast_id_map.rs
diff --git a/crates/ra_hir_expand/src/builtin_derive.rs b/crates/hir_expand/src/builtin_derive.rs
index 988a60d56..988a60d56 100644
--- a/crates/ra_hir_expand/src/builtin_derive.rs
+++ b/crates/hir_expand/src/builtin_derive.rs
diff --git a/crates/ra_hir_expand/src/builtin_macro.rs b/crates/hir_expand/src/builtin_macro.rs
index 86918b626..86918b626 100644
--- a/crates/ra_hir_expand/src/builtin_macro.rs
+++ b/crates/hir_expand/src/builtin_macro.rs
diff --git a/crates/ra_hir_expand/src/db.rs b/crates/hir_expand/src/db.rs
index dcc038bcd..dcc038bcd 100644
--- a/crates/ra_hir_expand/src/db.rs
+++ b/crates/hir_expand/src/db.rs
diff --git a/crates/ra_hir_expand/src/diagnostics.rs b/crates/hir_expand/src/diagnostics.rs
index 59d35debe..59d35debe 100644
--- a/crates/ra_hir_expand/src/diagnostics.rs
+++ b/crates/hir_expand/src/diagnostics.rs
diff --git a/crates/ra_hir_expand/src/eager.rs b/crates/hir_expand/src/eager.rs
index 10c45646f..10c45646f 100644
--- a/crates/ra_hir_expand/src/eager.rs
+++ b/crates/hir_expand/src/eager.rs
diff --git a/crates/ra_hir_expand/src/hygiene.rs b/crates/hir_expand/src/hygiene.rs
index 845e9cbc1..845e9cbc1 100644
--- a/crates/ra_hir_expand/src/hygiene.rs
+++ b/crates/hir_expand/src/hygiene.rs
diff --git a/crates/ra_hir_expand/src/lib.rs b/crates/hir_expand/src/lib.rs
index 7425b561a..2be15e841 100644
--- a/crates/ra_hir_expand/src/lib.rs
+++ b/crates/hir_expand/src/lib.rs
@@ -1,4 +1,4 @@
-//! `ra_hir_expand` deals with macro expansion.
+//! `hir_expand` deals with macro expansion.
 //!
 //! Specifically, it implements a concept of `MacroFile` -- a file whose syntax
 //! tree originates not from the text of some `FileId`, but from some macro
diff --git a/crates/ra_hir_expand/src/name.rs b/crates/hir_expand/src/name.rs
index 49841c7a1..49841c7a1 100644
--- a/crates/ra_hir_expand/src/name.rs
+++ b/crates/hir_expand/src/name.rs
diff --git a/crates/ra_hir_expand/src/proc_macro.rs b/crates/hir_expand/src/proc_macro.rs
index 80255ea32..80255ea32 100644
--- a/crates/ra_hir_expand/src/proc_macro.rs
+++ b/crates/hir_expand/src/proc_macro.rs
diff --git a/crates/ra_hir_expand/src/quote.rs b/crates/hir_expand/src/quote.rs
index 219bc2097..219bc2097 100644
--- a/crates/ra_hir_expand/src/quote.rs
+++ b/crates/hir_expand/src/quote.rs
diff --git a/crates/ra_hir_expand/src/test_db.rs b/crates/hir_expand/src/test_db.rs
index 86a5d867e..86a5d867e 100644
--- a/crates/ra_hir_expand/src/test_db.rs
+++ b/crates/hir_expand/src/test_db.rs
diff --git a/crates/ra_hir/Cargo.toml b/crates/ra_hir/Cargo.toml
index 5ccdb74fd..0ec1589c1 100644
--- a/crates/ra_hir/Cargo.toml
+++ b/crates/ra_hir/Cargo.toml
@@ -20,6 +20,6 @@ stdx = { path = "../stdx" }
 syntax = { path = "../syntax" }
 base_db = { path = "../base_db" }
 profile = { path = "../profile" }
-hir_expand = { path = "../ra_hir_expand", package = "ra_hir_expand" }
+hir_expand = { path = "../hir_expand" }
 hir_def = { path = "../ra_hir_def", package = "ra_hir_def" }
 hir_ty = { path = "../ra_hir_ty", package = "ra_hir_ty" }
diff --git a/crates/ra_hir/src/code_model.rs b/crates/ra_hir/src/code_model.rs
index d4d6b1759..8ffb9e99b 100644
--- a/crates/ra_hir/src/code_model.rs
+++ b/crates/ra_hir/src/code_model.rs
@@ -815,7 +815,7 @@ pub struct MacroDef {
 impl MacroDef {
     /// FIXME: right now, this just returns the root module of the crate that
     /// defines this macro. The reasons for this is that macros are expanded
-    /// early, in `ra_hir_expand`, where modules simply do not exist yet.
+    /// early, in `hir_expand`, where modules simply do not exist yet.
     pub fn module(self, db: &dyn HirDatabase) -> Option<Module> {
         let krate = self.id.krate?;
         let module_id = db.crate_def_map(krate).root;
diff --git a/crates/ra_hir_def/Cargo.toml b/crates/ra_hir_def/Cargo.toml
index 2b187bc4a..f93a213df 100644
--- a/crates/ra_hir_def/Cargo.toml
+++ b/crates/ra_hir_def/Cargo.toml
@@ -21,12 +21,11 @@ indexmap = "1.4.0"
 smallvec = "1.4.0"
 
 stdx = { path = "../stdx" }
-
 arena = { path = "../arena" }
 base_db = { path = "../base_db" }
 syntax = { path = "../syntax" }
 profile = { path = "../profile" }
-hir_expand = { path = "../ra_hir_expand", package = "ra_hir_expand" }
+hir_expand = { path = "../hir_expand" }
 test_utils = { path = "../test_utils" }
 mbe = { path = "../mbe" }
 cfg = { path = "../cfg" }
diff --git a/crates/ra_hir_ty/Cargo.toml b/crates/ra_hir_ty/Cargo.toml
index 720d171ac..75f04f9dd 100644
--- a/crates/ra_hir_ty/Cargo.toml
+++ b/crates/ra_hir_ty/Cargo.toml
@@ -19,7 +19,7 @@ rustc-hash = "1.1.0"
 stdx = { path = "../stdx" }
 
 hir_def = { path = "../ra_hir_def", package = "ra_hir_def" }
-hir_expand = { path = "../ra_hir_expand", package = "ra_hir_expand" }
+hir_expand = { path = "../hir_expand" }
 arena = { path = "../arena" }
 base_db = { path = "../base_db" }
 profile = { path = "../profile" }
diff --git a/xtask/tests/tidy.rs b/xtask/tests/tidy.rs
index 2e68e71db..dc367d1e0 100644
--- a/xtask/tests/tidy.rs
+++ b/xtask/tests/tidy.rs
@@ -193,7 +193,7 @@ impl TidyDocs {
 
         let poorly_documented = [
             "ra_hir",
-            "ra_hir_expand",
+            "hir_expand",
             "ra_ide",
             "mbe",
             "parser",