diff options
Diffstat (limited to 'crates/hir/src')
-rw-r--r-- | crates/hir/src/lib.rs | 30 |
1 files changed, 10 insertions, 20 deletions
diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs index 9c56fe1a6..3f0000889 100644 --- a/crates/hir/src/lib.rs +++ b/crates/hir/src/lib.rs | |||
@@ -303,26 +303,6 @@ impl ModuleDef { | |||
303 | Some(segments.join("::")) | 303 | Some(segments.join("::")) |
304 | } | 304 | } |
305 | 305 | ||
306 | pub fn definition_visibility(&self, db: &dyn HirDatabase) -> Option<Visibility> { | ||
307 | let module = match self { | ||
308 | ModuleDef::Module(it) => it.parent(db)?, | ||
309 | ModuleDef::Function(it) => return Some(it.visibility(db)), | ||
310 | ModuleDef::Adt(it) => it.module(db), | ||
311 | ModuleDef::Variant(it) => { | ||
312 | let parent = it.parent_enum(db); | ||
313 | let module = it.module(db); | ||
314 | return module.visibility_of(db, &ModuleDef::Adt(Adt::Enum(parent))); | ||
315 | } | ||
316 | ModuleDef::Const(it) => return Some(it.visibility(db)), | ||
317 | ModuleDef::Static(it) => it.module(db), | ||
318 | ModuleDef::Trait(it) => it.module(db), | ||
319 | ModuleDef::TypeAlias(it) => return Some(it.visibility(db)), | ||
320 | ModuleDef::BuiltinType(_) => return None, | ||
321 | }; | ||
322 | |||
323 | module.visibility_of(db, self) | ||
324 | } | ||
325 | |||
326 | pub fn name(self, db: &dyn HirDatabase) -> Option<Name> { | 306 | pub fn name(self, db: &dyn HirDatabase) -> Option<Name> { |
327 | match self { | 307 | match self { |
328 | ModuleDef::Adt(it) => Some(it.name(db)), | 308 | ModuleDef::Adt(it) => Some(it.name(db)), |
@@ -893,6 +873,16 @@ impl Adt { | |||
893 | } | 873 | } |
894 | } | 874 | } |
895 | 875 | ||
876 | impl HasVisibility for Adt { | ||
877 | fn visibility(&self, db: &dyn HirDatabase) -> Visibility { | ||
878 | match self { | ||
879 | Adt::Struct(it) => it.visibility(db), | ||
880 | Adt::Union(it) => it.visibility(db), | ||
881 | Adt::Enum(it) => it.visibility(db), | ||
882 | } | ||
883 | } | ||
884 | } | ||
885 | |||
896 | #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)] | 886 | #[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)] |
897 | pub enum VariantDef { | 887 | pub enum VariantDef { |
898 | Struct(Struct), | 888 | Struct(Struct), |