3 files changed, 14 insertions, 14 deletions

diff --git a/crates/ra_hir_def/src/nameres/collector.rs b/crates/ra_hir_def/src/nameres/collector.rs
index a80c4f8e9..f4678d145 100644
--- a/crates/ra_hir_def/src/nameres/collector.rs
+++ b/crates/ra_hir_def/src/nameres/collector.rs
@@ -743,7 +743,7 @@ where
         name: Name,
         declaration: AstId<ast::Module>,
         definition: Option<FileId>,
-        visibility: &crate::visibility::Visibility,
+        visibility: &crate::visibility::RawVisibility,
     ) -> LocalModuleId {
         let vis = self
             .def_collector
diff --git a/crates/ra_hir_def/src/nameres/path_resolution.rs b/crates/ra_hir_def/src/nameres/path_resolution.rs
index a56e3f08b..8a6256eee 100644
--- a/crates/ra_hir_def/src/nameres/path_resolution.rs
+++ b/crates/ra_hir_def/src/nameres/path_resolution.rs
@@ -21,7 +21,7 @@ use crate::{
     nameres::{BuiltinShadowMode, CrateDefMap},
     path::{ModPath, PathKind},
     per_ns::PerNs,
-    visibility::{ResolvedVisibility, Visibility},
+    visibility::{RawVisibility, ResolvedVisibility},
     AdtId, CrateId, EnumVariantId, LocalModuleId, ModuleDefId, ModuleId,
 };
 
@@ -71,10 +71,10 @@ impl CrateDefMap {
         &self,
         db: &impl DefDatabase,
         original_module: LocalModuleId,
-        visibility: &Visibility,
+        visibility: &RawVisibility,
     ) -> Option<ResolvedVisibility> {
         match visibility {
-            Visibility::Module(path) => {
+            RawVisibility::Module(path) => {
                 let (result, remaining) =
                     self.resolve_path(db, original_module, &path, BuiltinShadowMode::Module);
                 if remaining.is_some() {
@@ -89,7 +89,7 @@ impl CrateDefMap {
                     }
                 }
             }
-            Visibility::Public => Some(ResolvedVisibility::Public),
+            RawVisibility::Public => Some(ResolvedVisibility::Public),
         }
     }
 
diff --git a/crates/ra_hir_def/src/nameres/raw.rs b/crates/ra_hir_def/src/nameres/raw.rs
index 59f79f7cd..fac1169ef 100644
--- a/crates/ra_hir_def/src/nameres/raw.rs
+++ b/crates/ra_hir_def/src/nameres/raw.rs
@@ -22,7 +22,7 @@ use ra_syntax::{
 use test_utils::tested_by;
 
 use crate::{
-    attr::Attrs, db::DefDatabase, path::ModPath, visibility::Visibility, FileAstId, HirFileId,
+    attr::Attrs, db::DefDatabase, path::ModPath, visibility::RawVisibility, FileAstId, HirFileId,
     InFile,
 };
 
@@ -127,12 +127,12 @@ impl_arena_id!(Module);
 pub(super) enum ModuleData {
     Declaration {
         name: Name,
-        visibility: Visibility,
+        visibility: RawVisibility,
         ast_id: FileAstId<ast::Module>,
     },
     Definition {
         name: Name,
-        visibility: Visibility,
+        visibility: RawVisibility,
         ast_id: FileAstId<ast::Module>,
         items: Vec<RawItem>,
     },
@@ -150,7 +150,7 @@ pub struct ImportData {
     pub(super) is_prelude: bool,
     pub(super) is_extern_crate: bool,
     pub(super) is_macro_use: bool,
-    pub(super) visibility: Visibility,
+    pub(super) visibility: RawVisibility,
 }
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
@@ -161,7 +161,7 @@ impl_arena_id!(Def);
 pub(super) struct DefData {
     pub(super) name: Name,
     pub(super) kind: DefKind,
-    pub(super) visibility: Visibility,
+    pub(super) visibility: RawVisibility,
 }
 
 #[derive(Debug, PartialEq, Eq, Clone, Copy)]
@@ -232,7 +232,7 @@ impl RawItemsCollector {
 
     fn add_item(&mut self, current_module: Option<Module>, item: ast::ModuleItem) {
         let attrs = self.parse_attrs(&item);
-        let visibility = Visibility::from_ast_with_hygiene(item.visibility(), &self.hygiene);
+        let visibility = RawVisibility::from_ast_with_hygiene(item.visibility(), &self.hygiene);
         let (kind, name) = match item {
             ast::ModuleItem::Module(module) => {
                 self.add_module(current_module, module);
@@ -292,7 +292,7 @@ impl RawItemsCollector {
             None => return,
         };
         let attrs = self.parse_attrs(&module);
-        let visibility = Visibility::from_ast_with_hygiene(module.visibility(), &self.hygiene);
+        let visibility = RawVisibility::from_ast_with_hygiene(module.visibility(), &self.hygiene);
 
         let ast_id = self.source_ast_id_map.ast_id(&module);
         if module.has_semi() {
@@ -320,7 +320,7 @@ impl RawItemsCollector {
         // FIXME: cfg_attr
         let is_prelude = use_item.has_atom_attr("prelude_import");
         let attrs = self.parse_attrs(&use_item);
-        let visibility = Visibility::from_ast_with_hygiene(use_item.visibility(), &self.hygiene);
+        let visibility = RawVisibility::from_ast_with_hygiene(use_item.visibility(), &self.hygiene);
 
         let mut buf = Vec::new();
         ModPath::expand_use_item(
@@ -352,7 +352,7 @@ impl RawItemsCollector {
         if let Some(name_ref) = extern_crate.name_ref() {
             let path = ModPath::from_name_ref(&name_ref);
             let visibility =
-                Visibility::from_ast_with_hygiene(extern_crate.visibility(), &self.hygiene);
+                RawVisibility::from_ast_with_hygiene(extern_crate.visibility(), &self.hygiene);
             let alias = extern_crate.alias().and_then(|a| a.name()).map(|it| it.as_name());
             let attrs = self.parse_attrs(&extern_crate);
             // FIXME: cfg_attr