diff options
author | Aleksey Kladov <[email protected]> | 2019-10-29 12:11:42 +0000 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2019-10-29 12:11:42 +0000 |
commit | 6bf7faf315c57dbec6cb3d5a7c7089016603b309 (patch) | |
tree | 15bf7df06a6ebf8e59b466b8877214ac5aa9c98b /crates/ra_hir | |
parent | dba767802d05c493b7798b0173a2d102dcc73a95 (diff) |
flatten hir_expand
Diffstat (limited to 'crates/ra_hir')
-rw-r--r-- | crates/ra_hir/src/ids.rs | 4 | ||||
-rw-r--r-- | crates/ra_hir/src/source_id.rs | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/crates/ra_hir/src/ids.rs b/crates/ra_hir/src/ids.rs index eb2d23409..dea288eb7 100644 --- a/crates/ra_hir/src/ids.rs +++ b/crates/ra_hir/src/ids.rs | |||
@@ -15,9 +15,7 @@ use crate::{ | |||
15 | AstId, FileAstId, Module, Source, | 15 | AstId, FileAstId, Module, Source, |
16 | }; | 16 | }; |
17 | 17 | ||
18 | pub use hir_expand::expand::{ | 18 | pub use hir_expand::{HirFileId, MacroCallId, MacroCallLoc, MacroDefId, MacroFile, MacroFileKind}; |
19 | HirFileId, MacroCallId, MacroCallLoc, MacroDefId, MacroFile, MacroFileKind, | ||
20 | }; | ||
21 | 19 | ||
22 | macro_rules! impl_intern_key { | 20 | macro_rules! impl_intern_key { |
23 | ($name:ident) => { | 21 | ($name:ident) => { |
diff --git a/crates/ra_hir/src/source_id.rs b/crates/ra_hir/src/source_id.rs index b37474418..c69a2afeb 100644 --- a/crates/ra_hir/src/source_id.rs +++ b/crates/ra_hir/src/source_id.rs | |||
@@ -2,5 +2,5 @@ | |||
2 | 2 | ||
3 | pub use hir_expand::{ | 3 | pub use hir_expand::{ |
4 | ast_id_map::{AstIdMap, ErasedFileAstId, FileAstId}, | 4 | ast_id_map::{AstIdMap, ErasedFileAstId, FileAstId}, |
5 | expand::AstId, | 5 | AstId, |
6 | }; | 6 | }; |