diff options
Diffstat (limited to 'crates/hir_ty/src/lower.rs')
-rw-r--r-- | crates/hir_ty/src/lower.rs | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/crates/hir_ty/src/lower.rs b/crates/hir_ty/src/lower.rs index c4062a41d..cbbb535e5 100644 --- a/crates/hir_ty/src/lower.rs +++ b/crates/hir_ty/src/lower.rs | |||
@@ -16,10 +16,9 @@ use hir_def::{ | |||
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::{TypeBound, TypeRef}, | 18 | type_ref::{TypeBound, TypeRef}, |
19 | visibility::Visibility, | ||
20 | AdtId, AssocContainerId, AssocItemId, ConstId, ConstParamId, EnumId, EnumVariantId, FunctionId, | 19 | AdtId, AssocContainerId, AssocItemId, ConstId, ConstParamId, EnumId, EnumVariantId, FunctionId, |
21 | GenericDefId, HasModule, ImplId, LocalFieldId, Lookup, ModuleDefId, StaticId, StructId, | 20 | GenericDefId, HasModule, ImplId, LocalFieldId, Lookup, StaticId, StructId, TraitId, |
22 | TraitId, TypeAliasId, TypeParamId, UnionId, VariantId, | 21 | TypeAliasId, TypeParamId, UnionId, VariantId, |
23 | }; | 22 | }; |
24 | use hir_expand::name::Name; | 23 | use hir_expand::name::Name; |
25 | use la_arena::ArenaMap; | 24 | use la_arena::ArenaMap; |
@@ -868,28 +867,6 @@ pub(crate) fn field_types_query( | |||
868 | Arc::new(res) | 867 | Arc::new(res) |
869 | } | 868 | } |
870 | 869 | ||
871 | /// Resolve visibility of all specific fields of a struct or union variant. | ||
872 | pub(crate) fn field_visibilities_query( | ||
873 | db: &dyn HirDatabase, | ||
874 | variant_id: VariantId, | ||
875 | ) -> Arc<ArenaMap<LocalFieldId, Visibility>> { | ||
876 | let def_db = db.upcast(); | ||
877 | let var_data = variant_data(def_db, variant_id); | ||
878 | let resolver = variant_id.module(def_db).resolver(def_db); | ||
879 | let mut res = ArenaMap::default(); | ||
880 | for (field_id, field_data) in var_data.fields().iter() { | ||
881 | res.insert(field_id, field_data.visibility.resolve(def_db, &resolver)) | ||
882 | } | ||
883 | Arc::new(res) | ||
884 | } | ||
885 | |||
886 | /// Resolve visibility of a function. | ||
887 | pub(crate) fn fn_visibility_query(db: &dyn HirDatabase, def: FunctionId) -> Visibility { | ||
888 | let def_db = db.upcast(); | ||
889 | let resolver = ModuleDefId::from(def).module(def_db).unwrap().resolver(def_db); | ||
890 | db.function_data(def).visibility.resolve(def_db, &resolver) | ||
891 | } | ||
892 | |||
893 | /// This query exists only to be used when resolving short-hand associated types | 870 | /// This query exists only to be used when resolving short-hand associated types |
894 | /// like `T::Item`. | 871 | /// like `T::Item`. |
895 | /// | 872 | /// |