diff options
author | Jonas Schievink <[email protected]> | 2021-02-11 18:52:33 +0000 |
---|---|---|
committer | Jonas Schievink <[email protected]> | 2021-02-11 18:52:33 +0000 |
commit | 216dc856c5b48de7d9cdbe6259b2d0cd3c4e5042 (patch) | |
tree | f488d4f3d44e60ea6c3ff98b5fb8c8f2a209f907 /crates/hir/src/source_analyzer.rs | |
parent | b0f20a795d6b1f8d36d1cbe294e54ac592b98f5e (diff) |
Wrap `BuiltinType` in code model
Diffstat (limited to 'crates/hir/src/source_analyzer.rs')
-rw-r--r-- | crates/hir/src/source_analyzer.rs | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/crates/hir/src/source_analyzer.rs b/crates/hir/src/source_analyzer.rs index bed3fa50f..dc21f6051 100644 --- a/crates/hir/src/source_analyzer.rs +++ b/crates/hir/src/source_analyzer.rs | |||
@@ -28,8 +28,9 @@ use syntax::{ | |||
28 | }; | 28 | }; |
29 | 29 | ||
30 | use crate::{ | 30 | use crate::{ |
31 | db::HirDatabase, semantics::PathResolution, Adt, Const, Field, Function, Local, MacroDef, | 31 | code_model::BuiltinType, db::HirDatabase, semantics::PathResolution, Adt, Const, Field, |
32 | ModuleDef, Static, Struct, Trait, Type, TypeAlias, TypeParam, Variant, | 32 | Function, Local, MacroDef, ModuleDef, Static, Struct, Trait, Type, TypeAlias, TypeParam, |
33 | Variant, | ||
33 | }; | 34 | }; |
34 | use base_db::CrateId; | 35 | use base_db::CrateId; |
35 | 36 | ||
@@ -479,7 +480,7 @@ fn resolve_hir_path_( | |||
479 | } | 480 | } |
480 | TypeNs::EnumVariantId(it) => PathResolution::Def(Variant::from(it).into()), | 481 | TypeNs::EnumVariantId(it) => PathResolution::Def(Variant::from(it).into()), |
481 | TypeNs::TypeAliasId(it) => PathResolution::Def(TypeAlias::from(it).into()), | 482 | TypeNs::TypeAliasId(it) => PathResolution::Def(TypeAlias::from(it).into()), |
482 | TypeNs::BuiltinType(it) => PathResolution::Def(it.into()), | 483 | TypeNs::BuiltinType(it) => PathResolution::Def(BuiltinType::from(it).into()), |
483 | TypeNs::TraitId(it) => PathResolution::Def(Trait::from(it).into()), | 484 | TypeNs::TraitId(it) => PathResolution::Def(Trait::from(it).into()), |
484 | }) | 485 | }) |
485 | }; | 486 | }; |
@@ -555,7 +556,7 @@ fn resolve_hir_path_qualifier( | |||
555 | TypeNs::AdtSelfType(it) | TypeNs::AdtId(it) => PathResolution::Def(Adt::from(it).into()), | 556 | TypeNs::AdtSelfType(it) | TypeNs::AdtId(it) => PathResolution::Def(Adt::from(it).into()), |
556 | TypeNs::EnumVariantId(it) => PathResolution::Def(Variant::from(it).into()), | 557 | TypeNs::EnumVariantId(it) => PathResolution::Def(Variant::from(it).into()), |
557 | TypeNs::TypeAliasId(it) => PathResolution::Def(TypeAlias::from(it).into()), | 558 | TypeNs::TypeAliasId(it) => PathResolution::Def(TypeAlias::from(it).into()), |
558 | TypeNs::BuiltinType(it) => PathResolution::Def(it.into()), | 559 | TypeNs::BuiltinType(it) => PathResolution::Def(BuiltinType::from(it).into()), |
559 | TypeNs::TraitId(it) => PathResolution::Def(Trait::from(it).into()), | 560 | TypeNs::TraitId(it) => PathResolution::Def(Trait::from(it).into()), |
560 | }) | 561 | }) |
561 | } | 562 | } |