aboutsummaryrefslogtreecommitdiff
path: root/crates
diff options
context:
space:
mode:
Diffstat (limited to 'crates')
-rw-r--r--crates/ra_hir/Cargo.toml2
-rw-r--r--crates/ra_hir/src/db.rs2
-rw-r--r--crates/ra_hir/src/ids.rs2
-rw-r--r--crates/ra_hir/src/source_id.rs2
-rw-r--r--crates/ra_hir_expand/Cargo.toml (renamed from crates/ra_hir_def/Cargo.toml)2
-rw-r--r--crates/ra_hir_expand/src/ast_id_map.rs (renamed from crates/ra_hir_def/src/ast_id_map.rs)0
-rw-r--r--crates/ra_hir_expand/src/db.rs (renamed from crates/ra_hir_def/src/db.rs)0
-rw-r--r--crates/ra_hir_expand/src/expand.rs (renamed from crates/ra_hir_def/src/expand.rs)0
-rw-r--r--crates/ra_hir_expand/src/lib.rs (renamed from crates/ra_hir_def/src/lib.rs)0
9 files changed, 5 insertions, 5 deletions
diff --git a/crates/ra_hir/Cargo.toml b/crates/ra_hir/Cargo.toml
index 82720da9e..2090f3b20 100644
--- a/crates/ra_hir/Cargo.toml
+++ b/crates/ra_hir/Cargo.toml
@@ -19,7 +19,7 @@ ra_cfg = { path = "../ra_cfg" }
19ra_db = { path = "../ra_db" } 19ra_db = { path = "../ra_db" }
20mbe = { path = "../ra_mbe", package = "ra_mbe" } 20mbe = { path = "../ra_mbe", package = "ra_mbe" }
21tt = { path = "../ra_tt", package = "ra_tt" } 21tt = { path = "../ra_tt", package = "ra_tt" }
22hir_def = { path = "../ra_hir_def", package = "ra_hir_def" } 22hir_expand = { path = "../ra_hir_expand", package = "ra_hir_expand" }
23test_utils = { path = "../test_utils" } 23test_utils = { path = "../test_utils" }
24ra_prof = { path = "../ra_prof" } 24ra_prof = { path = "../ra_prof" }
25 25
diff --git a/crates/ra_hir/src/db.rs b/crates/ra_hir/src/db.rs
index a8fd695c0..6d34c671d 100644
--- a/crates/ra_hir/src/db.rs
+++ b/crates/ra_hir/src/db.rs
@@ -23,7 +23,7 @@ use crate::{
23 Static, Struct, StructField, Trait, TypeAlias, 23 Static, Struct, StructField, Trait, TypeAlias,
24}; 24};
25 25
26pub use hir_def::db::{ 26pub use hir_expand::db::{
27 AstDatabase, AstDatabaseStorage, AstIdMapQuery, MacroArgQuery, MacroDefQuery, MacroExpandQuery, 27 AstDatabase, AstDatabaseStorage, AstIdMapQuery, MacroArgQuery, MacroDefQuery, MacroExpandQuery,
28 ParseMacroQuery, 28 ParseMacroQuery,
29}; 29};
diff --git a/crates/ra_hir/src/ids.rs b/crates/ra_hir/src/ids.rs
index 9f85bb30d..eb2d23409 100644
--- a/crates/ra_hir/src/ids.rs
+++ b/crates/ra_hir/src/ids.rs
@@ -15,7 +15,7 @@ use crate::{
15 AstId, FileAstId, Module, Source, 15 AstId, FileAstId, Module, Source,
16}; 16};
17 17
18pub use hir_def::expand::{ 18pub use hir_expand::expand::{
19 HirFileId, MacroCallId, MacroCallLoc, MacroDefId, MacroFile, MacroFileKind, 19 HirFileId, MacroCallId, MacroCallLoc, MacroDefId, MacroFile, MacroFileKind,
20}; 20};
21 21
diff --git a/crates/ra_hir/src/source_id.rs b/crates/ra_hir/src/source_id.rs
index c70245949..b37474418 100644
--- a/crates/ra_hir/src/source_id.rs
+++ b/crates/ra_hir/src/source_id.rs
@@ -1,6 +1,6 @@
1//! FIXME: write short doc here 1//! FIXME: write short doc here
2 2
3pub use hir_def::{ 3pub use hir_expand::{
4 ast_id_map::{AstIdMap, ErasedFileAstId, FileAstId}, 4 ast_id_map::{AstIdMap, ErasedFileAstId, FileAstId},
5 expand::AstId, 5 expand::AstId,
6}; 6};
diff --git a/crates/ra_hir_def/Cargo.toml b/crates/ra_hir_expand/Cargo.toml
index 049f8a4fc..9bf5b7918 100644
--- a/crates/ra_hir_def/Cargo.toml
+++ b/crates/ra_hir_expand/Cargo.toml
@@ -1,6 +1,6 @@
1[package] 1[package]
2edition = "2018" 2edition = "2018"
3name = "ra_hir_def" 3name = "ra_hir_expand"
4version = "0.1.0" 4version = "0.1.0"
5authors = ["rust-analyzer developers"] 5authors = ["rust-analyzer developers"]
6 6
diff --git a/crates/ra_hir_def/src/ast_id_map.rs b/crates/ra_hir_expand/src/ast_id_map.rs
index c3b389102..c3b389102 100644
--- a/crates/ra_hir_def/src/ast_id_map.rs
+++ b/crates/ra_hir_expand/src/ast_id_map.rs
diff --git a/crates/ra_hir_def/src/db.rs b/crates/ra_hir_expand/src/db.rs
index 7133b61db..7133b61db 100644
--- a/crates/ra_hir_def/src/db.rs
+++ b/crates/ra_hir_expand/src/db.rs
diff --git a/crates/ra_hir_def/src/expand.rs b/crates/ra_hir_expand/src/expand.rs
index 6517ea84d..6517ea84d 100644
--- a/crates/ra_hir_def/src/expand.rs
+++ b/crates/ra_hir_expand/src/expand.rs
diff --git a/crates/ra_hir_def/src/lib.rs b/crates/ra_hir_expand/src/lib.rs
index 6ccb11068..6ccb11068 100644
--- a/crates/ra_hir_def/src/lib.rs
+++ b/crates/ra_hir_expand/src/lib.rs