diff options
author | cynecx <[email protected]> | 2021-04-17 16:38:38 +0100 |
---|---|---|
committer | cynecx <[email protected]> | 2021-04-17 16:38:45 +0100 |
commit | 7ed42a3a527b2c39826cfeb3626521c11abb25f0 (patch) | |
tree | 81c956d98c4990b0555540ad9cc1c94efa68deac /crates/hir_ty | |
parent | 14918a3870d568778473f0a5697a547b85acf20a (diff) |
hir_def: refactor expand_macro_type and cleanups
Diffstat (limited to 'crates/hir_ty')
-rw-r--r-- | crates/hir_ty/src/lower.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/hir_ty/src/lower.rs b/crates/hir_ty/src/lower.rs index 95ca5bdb0..e01b7aa91 100644 --- a/crates/hir_ty/src/lower.rs +++ b/crates/hir_ty/src/lower.rs | |||
@@ -15,7 +15,7 @@ use hir_def::{ | |||
15 | generics::{TypeParamProvenance, WherePredicate, WherePredicateTypeTarget}, | 15 | generics::{TypeParamProvenance, WherePredicate, WherePredicateTypeTarget}, |
16 | path::{GenericArg, Path, PathSegment, PathSegments}, | 16 | path::{GenericArg, Path, PathSegment, PathSegments}, |
17 | resolver::{HasResolver, Resolver, TypeNs}, | 17 | resolver::{HasResolver, Resolver, TypeNs}, |
18 | type_ref::{expand_type_ref, TraitRef as HirTraitRef, TypeBound, TypeRef}, | 18 | type_ref::{expand_macro_type, TraitRef as HirTraitRef, TypeBound, TypeRef}, |
19 | AdtId, AssocContainerId, AssocItemId, ConstId, ConstParamId, EnumId, EnumVariantId, FunctionId, | 19 | AdtId, AssocContainerId, AssocItemId, ConstId, ConstParamId, EnumId, EnumVariantId, FunctionId, |
20 | GenericDefId, HasModule, ImplId, LocalFieldId, Lookup, StaticId, StructId, TraitId, | 20 | GenericDefId, HasModule, ImplId, LocalFieldId, Lookup, StaticId, StructId, TraitId, |
21 | TypeAliasId, TypeParamId, UnionId, VariantId, | 21 | TypeAliasId, TypeParamId, UnionId, VariantId, |
@@ -289,8 +289,8 @@ impl<'a> TyLoweringContext<'a> { | |||
289 | } | 289 | } |
290 | mt @ TypeRef::Macro(_) => { | 290 | mt @ TypeRef::Macro(_) => { |
291 | if let Some(module_id) = self.resolver.module() { | 291 | if let Some(module_id) = self.resolver.module() { |
292 | match expand_type_ref(self.db.upcast(), module_id, mt) { | 292 | match expand_macro_type(self.db.upcast(), module_id, mt) { |
293 | Some(type_ref) => self.lower_ty(type_ref.as_ref()), | 293 | Some(type_ref) => self.lower_ty(&type_ref), |
294 | None => TyKind::Error.intern(&Interner), | 294 | None => TyKind::Error.intern(&Interner), |
295 | } | 295 | } |
296 | } else { | 296 | } else { |