From 6bf7faf315c57dbec6cb3d5a7c7089016603b309 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Tue, 29 Oct 2019 15:11:42 +0300
Subject: flatten hir_expand

---
 crates/ra_hir/src/ids.rs       | 4 +---
 crates/ra_hir/src/source_id.rs | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

(limited to 'crates/ra_hir')

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::{
     AstId, FileAstId, Module, Source,
 };
 
-pub use hir_expand::expand::{
-    HirFileId, MacroCallId, MacroCallLoc, MacroDefId, MacroFile, MacroFileKind,
-};
+pub use hir_expand::{HirFileId, MacroCallId, MacroCallLoc, MacroDefId, MacroFile, MacroFileKind};
 
 macro_rules! impl_intern_key {
     ($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 @@
 
 pub use hir_expand::{
     ast_id_map::{AstIdMap, ErasedFileAstId, FileAstId},
-    expand::AstId,
+    AstId,
 };
-- 
cgit v1.2.3