aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir/src
diff options
context:
space:
mode:
authorFlorian Diebold <[email protected]>2019-12-26 15:00:10 +0000
committerFlorian Diebold <[email protected]>2019-12-26 15:23:40 +0000
commit50ebff257dafe6e820f002241466ff4a98aa1f32 (patch)
tree5bfcf71964d649edb14b06394ff370c8ef556a5c /crates/ra_hir/src
parente1a2961273bdf7ef24c81f22fe86041a20812365 (diff)
Rename ResolvedVisibility -> Visibility
Diffstat (limited to 'crates/ra_hir/src')
-rw-r--r--crates/ra_hir/src/code_model.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/crates/ra_hir/src/code_model.rs b/crates/ra_hir/src/code_model.rs
index c5114742b..fdf316745 100644
--- a/crates/ra_hir/src/code_model.rs
+++ b/crates/ra_hir/src/code_model.rs
@@ -118,7 +118,7 @@ impl_froms!(
118 BuiltinType 118 BuiltinType
119); 119);
120 120
121pub use hir_def::{attr::Attrs, visibility::ResolvedVisibility}; 121pub use hir_def::{attr::Attrs, visibility::Visibility};
122 122
123impl Module { 123impl Module {
124 pub(crate) fn new(krate: Crate, crate_module_id: LocalModuleId) -> Module { 124 pub(crate) fn new(krate: Crate, crate_module_id: LocalModuleId) -> Module {
@@ -256,7 +256,7 @@ impl StructField {
256} 256}
257 257
258impl HasVisibility for StructField { 258impl HasVisibility for StructField {
259 fn visibility(&self, db: &impl HirDatabase) -> ResolvedVisibility { 259 fn visibility(&self, db: &impl HirDatabase) -> Visibility {
260 let struct_field_id: hir_def::StructFieldId = (*self).into(); 260 let struct_field_id: hir_def::StructFieldId = (*self).into();
261 let visibility = db.visibility(struct_field_id.into()); 261 let visibility = db.visibility(struct_field_id.into());
262 let parent_id: hir_def::VariantId = self.parent.into(); 262 let parent_id: hir_def::VariantId = self.parent.into();
@@ -1052,7 +1052,7 @@ impl<T: Into<AttrDef> + Copy> Docs for T {
1052} 1052}
1053 1053
1054pub trait HasVisibility { 1054pub trait HasVisibility {
1055 fn visibility(&self, db: &impl HirDatabase) -> ResolvedVisibility; 1055 fn visibility(&self, db: &impl HirDatabase) -> Visibility;
1056 fn visible_from(&self, db: &impl HirDatabase, module: Module) -> bool { 1056 fn visible_from(&self, db: &impl HirDatabase, module: Module) -> bool {
1057 let vis = self.visibility(db); 1057 let vis = self.visibility(db);
1058 vis.visible_from(db, module.id) 1058 vis.visible_from(db, module.id)