diff options
Diffstat (limited to 'crates/ra_hir_def/src/visibility.rs')
-rw-r--r-- | crates/ra_hir_def/src/visibility.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/crates/ra_hir_def/src/visibility.rs b/crates/ra_hir_def/src/visibility.rs index e0c59e905..62513873e 100644 --- a/crates/ra_hir_def/src/visibility.rs +++ b/crates/ra_hir_def/src/visibility.rs | |||
@@ -33,22 +33,22 @@ impl RawVisibility { | |||
33 | } | 33 | } |
34 | 34 | ||
35 | pub(crate) fn from_ast_with_default( | 35 | pub(crate) fn from_ast_with_default( |
36 | db: &impl DefDatabase, | 36 | db: &dyn DefDatabase, |
37 | default: RawVisibility, | 37 | default: RawVisibility, |
38 | node: InFile<Option<ast::Visibility>>, | 38 | node: InFile<Option<ast::Visibility>>, |
39 | ) -> RawVisibility { | 39 | ) -> RawVisibility { |
40 | Self::from_ast_with_hygiene_and_default( | 40 | Self::from_ast_with_hygiene_and_default( |
41 | node.value, | 41 | node.value, |
42 | default, | 42 | default, |
43 | &Hygiene::new(db, node.file_id), | 43 | &Hygiene::new(db.upcast(), node.file_id), |
44 | ) | 44 | ) |
45 | } | 45 | } |
46 | 46 | ||
47 | pub(crate) fn from_ast( | 47 | pub(crate) fn from_ast( |
48 | db: &impl DefDatabase, | 48 | db: &dyn DefDatabase, |
49 | node: InFile<Option<ast::Visibility>>, | 49 | node: InFile<Option<ast::Visibility>>, |
50 | ) -> RawVisibility { | 50 | ) -> RawVisibility { |
51 | Self::from_ast_with_hygiene(node.value, &Hygiene::new(db, node.file_id)) | 51 | Self::from_ast_with_hygiene(node.value, &Hygiene::new(db.upcast(), node.file_id)) |
52 | } | 52 | } |
53 | 53 | ||
54 | pub(crate) fn from_ast_with_hygiene( | 54 | pub(crate) fn from_ast_with_hygiene( |
@@ -90,7 +90,7 @@ impl RawVisibility { | |||
90 | 90 | ||
91 | pub fn resolve( | 91 | pub fn resolve( |
92 | &self, | 92 | &self, |
93 | db: &impl DefDatabase, | 93 | db: &dyn DefDatabase, |
94 | resolver: &crate::resolver::Resolver, | 94 | resolver: &crate::resolver::Resolver, |
95 | ) -> Visibility { | 95 | ) -> Visibility { |
96 | // we fall back to public visibility (i.e. fail open) if the path can't be resolved | 96 | // we fall back to public visibility (i.e. fail open) if the path can't be resolved |
@@ -108,7 +108,7 @@ pub enum Visibility { | |||
108 | } | 108 | } |
109 | 109 | ||
110 | impl Visibility { | 110 | impl Visibility { |
111 | pub fn is_visible_from(self, db: &impl DefDatabase, from_module: ModuleId) -> bool { | 111 | pub fn is_visible_from(self, db: &dyn DefDatabase, from_module: ModuleId) -> bool { |
112 | let to_module = match self { | 112 | let to_module = match self { |
113 | Visibility::Module(m) => m, | 113 | Visibility::Module(m) => m, |
114 | Visibility::Public => return true, | 114 | Visibility::Public => return true, |