use base_db::{impl_intern_key, salsa, CrateId, Upcast};
use hir_def::{
- db::DefDatabase, expr::ExprId, ConstParamId, DefWithBodyId, FunctionId, GenericDefId, ImplId,
- LocalFieldId, TypeParamId, VariantId,
+ db::DefDatabase, expr::ExprId, visibility::Visibility, ConstParamId, DefWithBodyId, FunctionId,
+ GenericDefId, ImplId, LocalFieldId, TypeParamId, VariantId,
};
use la_arena::ArenaMap;
krate: CrateId,
env: chalk_ir::Environment<chalk::Interner>,
) -> chalk_ir::ProgramClauses<chalk::Interner>;
+
+ #[salsa::invoke(crate::lower::field_visibilities_query)]
+ fn field_visibilities(&self, var: VariantId) -> Arc<ArenaMap<LocalFieldId, Visibility>>;
+
+ #[salsa::invoke(crate::lower::fn_visibility_query)]
+ fn fn_visibility(&self, def: FunctionId) -> Visibility;
}
fn infer_wait(db: &dyn HirDatabase, def: DefWithBodyId) -> Arc<InferenceResult> {
path::{GenericArg, Path, PathSegment, PathSegments},
resolver::{HasResolver, Resolver, TypeNs},
type_ref::{TypeBound, TypeRef},
+ visibility::Visibility,
AdtId, AssocContainerId, AssocItemId, ConstId, ConstParamId, EnumId, EnumVariantId, FunctionId,
- GenericDefId, HasModule, ImplId, LocalFieldId, Lookup, StaticId, StructId, TraitId,
- TypeAliasId, TypeParamId, UnionId, VariantId,
+ GenericDefId, HasModule, ImplId, LocalFieldId, Lookup, ModuleDefId, StaticId, StructId,
+ TraitId, TypeAliasId, TypeParamId, UnionId, VariantId,
};
use hir_expand::name::Name;
use la_arena::ArenaMap;
Arc::new(res)
}
+/// Resolve visibility of all specific fields of a struct or union variant.
+pub(crate) fn field_visibilities_query(
+ db: &dyn HirDatabase,
+ variant_id: VariantId,
+) -> Arc<ArenaMap<LocalFieldId, Visibility>> {
+ let def_db = db.upcast();
+ let var_data = variant_data(def_db, variant_id);
+ let resolver = variant_id.module(def_db).resolver(def_db);
+ let mut res = ArenaMap::default();
+ for (field_id, field_data) in var_data.fields().iter() {
+ res.insert(field_id, field_data.visibility.resolve(def_db, &resolver))
+ }
+ Arc::new(res)
+}
+
+/// Resolve visibility of a function.
+pub(crate) fn fn_visibility_query(db: &dyn HirDatabase, def: FunctionId) -> Visibility {
+ let def_db = db.upcast();
+ let resolver = ModuleDefId::from(def).module(def_db).unwrap().resolver(def_db);
+ db.function_data(def).visibility.resolve(def_db, &resolver)
+}
+
/// This query exists only to be used when resolving short-hand associated types
/// like `T::Item`.
///