aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir/src/nameres
diff options
context:
space:
mode:
authorbors[bot] <bors[bot]@users.noreply.github.com>2019-02-24 20:39:27 +0000
committerbors[bot] <bors[bot]@users.noreply.github.com>2019-02-24 20:39:27 +0000
commitdfca3cbeb0680ad1e3694d442b6c761fe3007521 (patch)
treee87434ec26daadf0c3d1f8486391d6c183b29c49 /crates/ra_hir/src/nameres
parent61d961263387f7293f3d0c4d7b8c8c9a07959ced (diff)
parentbd8ed644e4362785b079ba9fbe2d4e490a678d27 (diff)
Merge #894
894: Rename Type => TypeAlias r=matklad a=flodiebold Co-authored-by: Florian Diebold <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/nameres')
-rw-r--r--crates/ra_hir/src/nameres/lower.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/crates/ra_hir/src/nameres/lower.rs b/crates/ra_hir/src/nameres/lower.rs
index 81d80654c..522f13b44 100644
--- a/crates/ra_hir/src/nameres/lower.rs
+++ b/crates/ra_hir/src/nameres/lower.rs
@@ -10,7 +10,7 @@ use rustc_hash::FxHashMap;
10use crate::{ 10use crate::{
11 SourceItemId, Path, ModuleSource, Name, 11 SourceItemId, Path, ModuleSource, Name,
12 HirFileId, MacroCallLoc, AsName, PerNs, Function, 12 HirFileId, MacroCallLoc, AsName, PerNs, Function,
13 ModuleDef, Module, Struct, Enum, Const, Static, Trait, Type, 13 ModuleDef, Module, Struct, Enum, Const, Static, Trait, TypeAlias,
14 ids::LocationCtx, PersistentHirDatabase, 14 ids::LocationCtx, PersistentHirDatabase,
15}; 15};
16 16
@@ -169,7 +169,7 @@ impl LoweredModule {
169 } 169 }
170 ast::ModuleItemKind::TypeDef(it) => { 170 ast::ModuleItemKind::TypeDef(it) => {
171 if let Some(name) = it.name() { 171 if let Some(name) = it.name() {
172 let t = Type { id: ctx.to_def(it) }; 172 let t = TypeAlias { id: ctx.to_def(it) };
173 self.declarations.insert(name.as_name(), PerNs::types(t.into())); 173 self.declarations.insert(name.as_name(), PerNs::types(t.into()));
174 } 174 }
175 } 175 }