simplify visibility.rs

This commit is contained in:
Jonas Schievink 2021-04-05 04:27:57 +02:00
parent 7c0c713a10
commit 6f1ee9a7f4

View file

@ -11,7 +11,7 @@ use crate::{
nameres::DefMap, nameres::DefMap,
path::{ModPath, PathKind}, path::{ModPath, PathKind},
resolver::HasResolver, resolver::HasResolver,
FunctionId, HasModule, LocalFieldId, ModuleDefId, ModuleId, VariantId, FunctionId, HasModule, LocalFieldId, ModuleId, VariantId,
}; };
/// Visibility of an item, not yet resolved. /// Visibility of an item, not yet resolved.
@ -25,7 +25,7 @@ pub enum RawVisibility {
} }
impl RawVisibility { impl RawVisibility {
pub(crate) const fn private() -> RawVisibility { pub(crate) fn private() -> RawVisibility {
RawVisibility::Module(ModPath::from_kind(PathKind::Super(0))) RawVisibility::Module(ModPath::from_kind(PathKind::Super(0)))
} }
@ -217,6 +217,6 @@ pub(crate) fn field_visibilities_query(
/// Resolve visibility of a function. /// Resolve visibility of a function.
pub(crate) fn function_visibility_query(db: &dyn DefDatabase, def: FunctionId) -> Visibility { pub(crate) fn function_visibility_query(db: &dyn DefDatabase, def: FunctionId) -> Visibility {
let resolver = ModuleDefId::from(def).module(db).unwrap().resolver(db); let resolver = def.resolver(db);
db.function_data(def).visibility.resolve(db, &resolver) db.function_data(def).visibility.resolve(db, &resolver)
} }