50 files changed, 21 insertions, 21 deletions
diff --git a/crates/ra_hir_def/Cargo.toml b/crates/hir_def/Cargo.toml
index f93a213df..403bc2aff 100644
--- a/crates/ra_hir_def/Cargo.toml
+++ b/crates/hir_def/Cargo.toml
@@ -1,9 +1,9 @@
 [package]
-edition = "2018"
+name = "hir_def"
-name = "ra_hir_def"
+version = "0.0.0"
-version = "0.1.0"
-authors = ["rust-analyzer developers"]
 license = "MIT OR Apache-2.0"
+authors = ["rust-analyzer developers"]
+edition = "2018"
 [lib]
 doctest = false
diff --git a/crates/ra_hir_def/src/adt.rs b/crates/hir_def/src/adt.rs
index d69ff2fc7..d69ff2fc7 100644
--- a/crates/ra_hir_def/src/adt.rs
+++ b/crates/hir_def/src/adt.rs
diff --git a/crates/ra_hir_def/src/attr.rs b/crates/hir_def/src/attr.rs
index dea552a60..dea552a60 100644
--- a/crates/ra_hir_def/src/attr.rs
+++ b/crates/hir_def/src/attr.rs
diff --git a/crates/ra_hir_def/src/body.rs b/crates/hir_def/src/body.rs
index 9a9a605dd..9a9a605dd 100644
--- a/crates/ra_hir_def/src/body.rs
+++ b/crates/hir_def/src/body.rs
diff --git a/crates/ra_hir_def/src/body/lower.rs b/crates/hir_def/src/body/lower.rs
index a26251cde..a26251cde 100644
--- a/crates/ra_hir_def/src/body/lower.rs
+++ b/crates/hir_def/src/body/lower.rs
diff --git a/crates/ra_hir_def/src/body/scope.rs b/crates/hir_def/src/body/scope.rs
index 9142bc05b..9142bc05b 100644
--- a/crates/ra_hir_def/src/body/scope.rs
+++ b/crates/hir_def/src/body/scope.rs
diff --git a/crates/ra_hir_def/src/builtin_type.rs b/crates/hir_def/src/builtin_type.rs
index 0f872b5c0..0f872b5c0 100644
--- a/crates/ra_hir_def/src/builtin_type.rs
+++ b/crates/hir_def/src/builtin_type.rs
diff --git a/crates/ra_hir_def/src/child_by_source.rs b/crates/hir_def/src/child_by_source.rs
index dcb00a1d9..dcb00a1d9 100644
--- a/crates/ra_hir_def/src/child_by_source.rs
+++ b/crates/hir_def/src/child_by_source.rs
diff --git a/crates/ra_hir_def/src/data.rs b/crates/hir_def/src/data.rs
index 9a8eb4ede..9a8eb4ede 100644
--- a/crates/ra_hir_def/src/data.rs
+++ b/crates/hir_def/src/data.rs
diff --git a/crates/ra_hir_def/src/db.rs b/crates/hir_def/src/db.rs
index 6d694de11..6d694de11 100644
--- a/crates/ra_hir_def/src/db.rs
+++ b/crates/hir_def/src/db.rs
diff --git a/crates/ra_hir_def/src/diagnostics.rs b/crates/hir_def/src/diagnostics.rs
index 2e38a978f..2e38a978f 100644
--- a/crates/ra_hir_def/src/diagnostics.rs
+++ b/crates/hir_def/src/diagnostics.rs
diff --git a/crates/ra_hir_def/src/docs.rs b/crates/hir_def/src/docs.rs
index e9a02b11b..e9a02b11b 100644
--- a/crates/ra_hir_def/src/docs.rs
+++ b/crates/hir_def/src/docs.rs
diff --git a/crates/ra_hir_def/src/dyn_map.rs b/crates/hir_def/src/dyn_map.rs
index 6f269d7b0..6f269d7b0 100644
--- a/crates/ra_hir_def/src/dyn_map.rs
+++ b/crates/hir_def/src/dyn_map.rs
diff --git a/crates/ra_hir_def/src/expr.rs b/crates/hir_def/src/expr.rs
index c94b3a36f..c94b3a36f 100644
--- a/crates/ra_hir_def/src/expr.rs
+++ b/crates/hir_def/src/expr.rs
diff --git a/crates/ra_hir_def/src/find_path.rs b/crates/hir_def/src/find_path.rs
index ac2c54ac5..ac2c54ac5 100644
--- a/crates/ra_hir_def/src/find_path.rs
+++ b/crates/hir_def/src/find_path.rs
diff --git a/crates/ra_hir_def/src/generics.rs b/crates/hir_def/src/generics.rs
index 835fe3fbd..835fe3fbd 100644
--- a/crates/ra_hir_def/src/generics.rs
+++ b/crates/hir_def/src/generics.rs
diff --git a/crates/ra_hir_def/src/import_map.rs b/crates/hir_def/src/import_map.rs
index d32a0bdaf..d32a0bdaf 100644
--- a/crates/ra_hir_def/src/import_map.rs
+++ b/crates/hir_def/src/import_map.rs
diff --git a/crates/ra_hir_def/src/item_scope.rs b/crates/hir_def/src/item_scope.rs
index f1e9dfd5b..f1e9dfd5b 100644
--- a/crates/ra_hir_def/src/item_scope.rs
+++ b/crates/hir_def/src/item_scope.rs
diff --git a/crates/ra_hir_def/src/item_tree.rs b/crates/hir_def/src/item_tree.rs
index e14722cae..e14722cae 100644
--- a/crates/ra_hir_def/src/item_tree.rs
+++ b/crates/hir_def/src/item_tree.rs
diff --git a/crates/ra_hir_def/src/item_tree/lower.rs b/crates/hir_def/src/item_tree/lower.rs
index 391ab5d39..391ab5d39 100644
--- a/crates/ra_hir_def/src/item_tree/lower.rs
+++ b/crates/hir_def/src/item_tree/lower.rs
diff --git a/crates/ra_hir_def/src/item_tree/tests.rs b/crates/hir_def/src/item_tree/tests.rs
index 2f62eddcb..9c5bf72bd 100644
--- a/crates/ra_hir_def/src/item_tree/tests.rs
+++ b/crates/hir_def/src/item_tree/tests.rs
@@ -246,13 +246,13 @@ fn smoke() {
            #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("struct0"))] }, input: None }]) }]
            Struct { name: Name(Text("Struct0")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(1), fields: Unit, ast_id: FileAstId::<syntax::ast::generated::nodes::Struct>(3), kind: Unit }
            #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("struct1"))] }, input: None }]) }]
-            Struct { name: Name(Text("Struct1")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(2), fields: Tuple(IdRange::<ra_hir_def::item_tree::Field>(0..1)), ast_id: FileAstId::<syntax::ast::generated::nodes::Struct>(4), kind: Tuple }
+            Struct { name: Name(Text("Struct1")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(2), fields: Tuple(IdRange::<hir_def::item_tree::Field>(0..1)), ast_id: FileAstId::<syntax::ast::generated::nodes::Struct>(4), kind: Tuple }
            #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("struct2"))] }, input: None }]) }]
-            Struct { name: Name(Text("Struct2")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(3), fields: Record(IdRange::<ra_hir_def::item_tree::Field>(1..2)), ast_id: FileAstId::<syntax::ast::generated::nodes::Struct>(5), kind: Record }
+            Struct { name: Name(Text("Struct2")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(3), fields: Record(IdRange::<hir_def::item_tree::Field>(1..2)), ast_id: FileAstId::<syntax::ast::generated::nodes::Struct>(5), kind: Record }
            #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("en"))] }, input: None }]) }]
-            Enum { name: Name(Text("En")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), variants: IdRange::<ra_hir_def::item_tree::Variant>(0..1), ast_id: FileAstId::<syntax::ast::generated::nodes::Enum>(6) }
+            Enum { name: Name(Text("En")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), variants: IdRange::<hir_def::item_tree::Variant>(0..1), ast_id: FileAstId::<syntax::ast::generated::nodes::Enum>(6) }
            #[Attrs { entries: Some([Attr { path: ModPath { kind: Plain, segments: [Name(Text("un"))] }, input: None }]) }]
-            Union { name: Name(Text("Un")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), fields: Record(IdRange::<ra_hir_def::item_tree::Field>(3..4)), ast_id: FileAstId::<syntax::ast::generated::nodes::Union>(7) }
+            Union { name: Name(Text("Un")), visibility: RawVisibilityId("pub(self)"), generic_params: GenericParamsId(4294967295), fields: Record(IdRange::<hir_def::item_tree::Field>(3..4)), ast_id: FileAstId::<syntax::ast::generated::nodes::Union>(7) }
        "##]],
    );
 }
diff --git a/crates/ra_hir_def/src/keys.rs b/crates/hir_def/src/keys.rs
index 40a5d92b5..40a5d92b5 100644
--- a/crates/ra_hir_def/src/keys.rs
+++ b/crates/hir_def/src/keys.rs
diff --git a/crates/ra_hir_def/src/lang_item.rs b/crates/hir_def/src/lang_item.rs
index 063eadccb..063eadccb 100644
--- a/crates/ra_hir_def/src/lang_item.rs
+++ b/crates/hir_def/src/lang_item.rs
diff --git a/crates/ra_hir_def/src/lib.rs b/crates/hir_def/src/lib.rs
index f24a1dd77..f24a1dd77 100644
--- a/crates/ra_hir_def/src/lib.rs
+++ b/crates/hir_def/src/lib.rs
diff --git a/crates/ra_hir_def/src/nameres.rs b/crates/hir_def/src/nameres.rs
index bf302172d..bf302172d 100644
--- a/crates/ra_hir_def/src/nameres.rs
+++ b/crates/hir_def/src/nameres.rs
diff --git a/crates/ra_hir_def/src/nameres/collector.rs b/crates/hir_def/src/nameres/collector.rs
index 3e99c8773..3e99c8773 100644
--- a/crates/ra_hir_def/src/nameres/collector.rs
+++ b/crates/hir_def/src/nameres/collector.rs
diff --git a/crates/ra_hir_def/src/nameres/mod_resolution.rs b/crates/hir_def/src/nameres/mod_resolution.rs
index e8389b484..e8389b484 100644
--- a/crates/ra_hir_def/src/nameres/mod_resolution.rs
+++ b/crates/hir_def/src/nameres/mod_resolution.rs
diff --git a/crates/ra_hir_def/src/nameres/path_resolution.rs b/crates/hir_def/src/nameres/path_resolution.rs
index 88e10574e..88e10574e 100644
--- a/crates/ra_hir_def/src/nameres/path_resolution.rs
+++ b/crates/hir_def/src/nameres/path_resolution.rs
diff --git a/crates/ra_hir_def/src/nameres/tests.rs b/crates/hir_def/src/nameres/tests.rs
index b105d56b2..b105d56b2 100644
--- a/crates/ra_hir_def/src/nameres/tests.rs
+++ b/crates/hir_def/src/nameres/tests.rs
diff --git a/crates/ra_hir_def/src/nameres/tests/globs.rs b/crates/hir_def/src/nameres/tests/globs.rs
index 2ae836e3c..2ae836e3c 100644
--- a/crates/ra_hir_def/src/nameres/tests/globs.rs
+++ b/crates/hir_def/src/nameres/tests/globs.rs
diff --git a/crates/ra_hir_def/src/nameres/tests/incremental.rs b/crates/hir_def/src/nameres/tests/incremental.rs
index cfbc62cc4..cfbc62cc4 100644
--- a/crates/ra_hir_def/src/nameres/tests/incremental.rs
+++ b/crates/hir_def/src/nameres/tests/incremental.rs
diff --git a/crates/ra_hir_def/src/nameres/tests/macros.rs b/crates/hir_def/src/nameres/tests/macros.rs
index e0fb8bdef..e0fb8bdef 100644
--- a/crates/ra_hir_def/src/nameres/tests/macros.rs
+++ b/crates/hir_def/src/nameres/tests/macros.rs
diff --git a/crates/ra_hir_def/src/nameres/tests/mod_resolution.rs b/crates/hir_def/src/nameres/tests/mod_resolution.rs
index 1f619787e..1f619787e 100644
--- a/crates/ra_hir_def/src/nameres/tests/mod_resolution.rs
+++ b/crates/hir_def/src/nameres/tests/mod_resolution.rs
diff --git a/crates/ra_hir_def/src/nameres/tests/primitives.rs b/crates/hir_def/src/nameres/tests/primitives.rs
index 215e8952d..215e8952d 100644
--- a/crates/ra_hir_def/src/nameres/tests/primitives.rs
+++ b/crates/hir_def/src/nameres/tests/primitives.rs
diff --git a/crates/ra_hir_def/src/path.rs b/crates/hir_def/src/path.rs
index 74d26f08b..74d26f08b 100644
--- a/crates/ra_hir_def/src/path.rs
+++ b/crates/hir_def/src/path.rs
diff --git a/crates/ra_hir_def/src/path/lower.rs b/crates/hir_def/src/path/lower.rs
index 07b9723ce..07b9723ce 100644
--- a/crates/ra_hir_def/src/path/lower.rs
+++ b/crates/hir_def/src/path/lower.rs
diff --git a/crates/ra_hir_def/src/path/lower/lower_use.rs b/crates/hir_def/src/path/lower/lower_use.rs
index 53cecb05f..53cecb05f 100644
--- a/crates/ra_hir_def/src/path/lower/lower_use.rs
+++ b/crates/hir_def/src/path/lower/lower_use.rs
diff --git a/crates/ra_hir_def/src/per_ns.rs b/crates/hir_def/src/per_ns.rs
index 74665c588..74665c588 100644
--- a/crates/ra_hir_def/src/per_ns.rs
+++ b/crates/hir_def/src/per_ns.rs
diff --git a/crates/ra_hir_def/src/resolver.rs b/crates/hir_def/src/resolver.rs
index f8cc5e075..f8cc5e075 100644
--- a/crates/ra_hir_def/src/resolver.rs
+++ b/crates/hir_def/src/resolver.rs
diff --git a/crates/ra_hir_def/src/src.rs b/crates/hir_def/src/src.rs
index 7a79b0314..7a79b0314 100644
--- a/crates/ra_hir_def/src/src.rs
+++ b/crates/hir_def/src/src.rs
diff --git a/crates/ra_hir_def/src/test_db.rs b/crates/hir_def/src/test_db.rs
index 42a762936..42a762936 100644
--- a/crates/ra_hir_def/src/test_db.rs
+++ b/crates/hir_def/src/test_db.rs
diff --git a/crates/ra_hir_def/src/trace.rs b/crates/hir_def/src/trace.rs
index fd64e7018..fd64e7018 100644
--- a/crates/ra_hir_def/src/trace.rs
+++ b/crates/hir_def/src/trace.rs
diff --git a/crates/ra_hir_def/src/type_ref.rs b/crates/hir_def/src/type_ref.rs
index 1a78c1444..1a78c1444 100644
--- a/crates/ra_hir_def/src/type_ref.rs
+++ b/crates/hir_def/src/type_ref.rs
diff --git a/crates/ra_hir_def/src/visibility.rs b/crates/hir_def/src/visibility.rs
index e6e0853a3..e6e0853a3 100644
--- a/crates/ra_hir_def/src/visibility.rs
+++ b/crates/hir_def/src/visibility.rs
diff --git a/crates/ra_hir/Cargo.toml b/crates/ra_hir/Cargo.toml
index 0ec1589c1..edca5dc6f 100644
--- a/crates/ra_hir/Cargo.toml
+++ b/crates/ra_hir/Cargo.toml
@@ -21,5 +21,5 @@ syntax = { path = "../syntax" }
 base_db = { path = "../base_db" }
 profile = { path = "../profile" }
 hir_expand = { path = "../hir_expand" }
-hir_def = { path = "../ra_hir_def", package = "ra_hir_def" }
+hir_def = { path = "../hir_def" }
 hir_ty = { path = "../ra_hir_ty", package = "ra_hir_ty" }
diff --git a/crates/ra_hir_ty/Cargo.toml b/crates/ra_hir_ty/Cargo.toml
index 75f04f9dd..d430b08ca 100644
--- a/crates/ra_hir_ty/Cargo.toml
+++ b/crates/ra_hir_ty/Cargo.toml
@@ -18,7 +18,7 @@ rustc-hash = "1.1.0"
 stdx = { path = "../stdx" }
-hir_def = { path = "../ra_hir_def", package = "ra_hir_def" }
+hir_def = { path = "../hir_def" }
 hir_expand = { path = "../hir_expand" }
 arena = { path = "../arena" }
 base_db = { path = "../base_db" }
diff --git a/crates/ra_hir_ty/src/tests/simple.rs b/crates/ra_hir_ty/src/tests/simple.rs
index 5a7cf9455..59eb59d5f 100644
--- a/crates/ra_hir_ty/src/tests/simple.rs
+++ b/crates/ra_hir_ty/src/tests/simple.rs
@@ -1776,8 +1776,8 @@ fn main() {
    );
 }
-// This test is actually testing the shadowing behavior within ra_hir_def. It
+// This test is actually testing the shadowing behavior within hir_def. It
-// lives here because the testing infrastructure in ra_hir_def isn't currently
+// lives here because the testing infrastructure in hir_def isn't currently
 // capable of asserting the necessary conditions.
 #[test]
 fn should_be_shadowing_imports() {
diff --git a/crates/rust-analyzer/Cargo.toml b/crates/rust-analyzer/Cargo.toml
index 210d9e9c8..0dee719de 100644
--- a/crates/rust-analyzer/Cargo.toml
+++ b/crates/rust-analyzer/Cargo.toml
@@ -50,7 +50,7 @@ base_db = { path = "../base_db" }
 ra_ide_db = { path = "../ra_ide_db" }
 ra_ssr = { path = "../ra_ssr" }
 hir = { path = "../ra_hir", package = "ra_hir" }
-hir_def = { path = "../ra_hir_def", package = "ra_hir_def" }
+hir_def = { path = "../hir_def" }
 hir_ty = { path = "../ra_hir_ty", package = "ra_hir_ty" }
 proc_macro_srv = { path = "../proc_macro_srv" }
diff --git a/crates/rust-analyzer/src/diagnostics/to_proto.rs b/crates/rust-analyzer/src/diagnostics/to_proto.rs
index 97f331352..6d5408156 100644
--- a/crates/rust-analyzer/src/diagnostics/to_proto.rs
+++ b/crates/rust-analyzer/src/diagnostics/to_proto.rs
@@ -1116,7 +1116,7 @@ mod tests {
    fn macro_compiler_error() {
        check(
            r##"{
-        "rendered": "error: Please register your known path in the path module\n   --> crates/ra_hir_def/src/path.rs:265:9\n    |\n265 |         compile_error!(\"Please register your known path in the path module\")\n    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n    | \n   ::: crates/ra_hir_def/src/data.rs:80:16\n    |\n80  |     let path = path![std::future::Future];\n    |                -------------------------- in this macro invocation\n\n",
+        "rendered": "error: Please register your known path in the path module\n   --> crates/hir_def/src/path.rs:265:9\n    |\n265 |         compile_error!(\"Please register your known path in the path module\")\n    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n    | \n   ::: crates/hir_def/src/data.rs:80:16\n    |\n80  |     let path = path![std::future::Future];\n    |                -------------------------- in this macro invocation\n\n",
        "children": [],
        "code": null,
        "level": "error",
@@ -1134,7 +1134,7 @@ mod tests {
                        "column_end": 2,
                        "column_start": 1,
                        "expansion": null,
-                        "file_name": "crates/ra_hir_def/src/path.rs",
+                        "file_name": "crates/hir_def/src/path.rs",
                        "is_primary": false,
                        "label": null,
                        "line_end": 267,
@@ -1227,7 +1227,7 @@ mod tests {
                                "column_end": 2,
                                "column_start": 1,
                                "expansion": null,
-                                "file_name": "crates/ra_hir_def/src/path.rs",
+                                "file_name": "crates/hir_def/src/path.rs",
                                "is_primary": false,
                                "label": null,
                                "line_end": 277,
@@ -1284,7 +1284,7 @@ mod tests {
                                "column_end": 42,
                                "column_start": 16,
                                "expansion": null,
-                                "file_name": "crates/ra_hir_def/src/data.rs",
+                                "file_name": "crates/hir_def/src/data.rs",
                                "is_primary": false,
                                "label": null,
                                "line_end": 80,
@@ -1300,7 +1300,7 @@ mod tests {
                                ]
                            }
                        },
-                        "file_name": "crates/ra_hir_def/src/path.rs",
+                        "file_name": "crates/hir_def/src/path.rs",
                        "is_primary": false,
                        "label": null,
                        "line_end": 272,
@@ -1316,7 +1316,7 @@ mod tests {
                        ]
                    }
                },
-                "file_name": "crates/ra_hir_def/src/path.rs",
+                "file_name": "crates/hir_def/src/path.rs",
                "is_primary": true,
                "label": null,
                "line_end": 265,
diff --git a/crates/rust-analyzer/test_data/macro_compiler_error.txt b/crates/rust-analyzer/test_data/macro_compiler_error.txt
index f695db73c..89dae7d5a 100644
--- a/crates/rust-analyzer/test_data/macro_compiler_error.txt
+++ b/crates/rust-analyzer/test_data/macro_compiler_error.txt
@@ -1,6 +1,6 @@
 [
    MappedRustDiagnostic {
-        url: "file:///test/crates/ra_hir_def/src/data.rs",
+        url: "file:///test/crates/hir_def/src/data.rs",
        diagnostic: Diagnostic {
            range: Range {
                start: Position {
@@ -24,7 +24,7 @@
                [
                    DiagnosticRelatedInformation {
                        location: Location {
-                            uri: "file:///test/crates/ra_hir_def/src/path.rs",
+                            uri: "file:///test/crates/hir_def/src/path.rs",
                            range: Range {
                                start: Position {
                                    line: 264,