aboutsummaryrefslogtreecommitdiff
path: root/crates/ra_hir_def/src/nameres/raw.rs
diff options
context:
space:
mode:
authorFlorian Diebold <[email protected]>2019-12-26 14:57:14 +0000
committerFlorian Diebold <[email protected]>2019-12-26 15:23:40 +0000
commite1a2961273bdf7ef24c81f22fe86041a20812365 (patch)
tree1b2e3e4e76b121a43a6fc3fb1112668089c44abc /crates/ra_hir_def/src/nameres/raw.rs
parent04e8eaa14b11c432d43ad95f3766f8649da30347 (diff)
Rename Visibility -> RawVisibility
Diffstat (limited to 'crates/ra_hir_def/src/nameres/raw.rs')
-rw-r--r--crates/ra_hir_def/src/nameres/raw.rs18
1 files changed, 9 insertions, 9 deletions
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::{
22use test_utils::tested_by; 22use test_utils::tested_by;
23 23
24use crate::{ 24use crate::{
25 attr::Attrs, db::DefDatabase, path::ModPath, visibility::Visibility, FileAstId, HirFileId, 25 attr::Attrs, db::DefDatabase, path::ModPath, visibility::RawVisibility, FileAstId, HirFileId,
26 InFile, 26 InFile,
27}; 27};
28 28
@@ -127,12 +127,12 @@ impl_arena_id!(Module);
127pub(super) enum ModuleData { 127pub(super) enum ModuleData {
128 Declaration { 128 Declaration {
129 name: Name, 129 name: Name,
130 visibility: Visibility, 130 visibility: RawVisibility,
131 ast_id: FileAstId<ast::Module>, 131 ast_id: FileAstId<ast::Module>,
132 }, 132 },
133 Definition { 133 Definition {
134 name: Name, 134 name: Name,
135 visibility: Visibility, 135 visibility: RawVisibility,
136 ast_id: FileAstId<ast::Module>, 136 ast_id: FileAstId<ast::Module>,
137 items: Vec<RawItem>, 137 items: Vec<RawItem>,
138 }, 138 },
@@ -150,7 +150,7 @@ pub struct ImportData {
150 pub(super) is_prelude: bool, 150 pub(super) is_prelude: bool,
151 pub(super) is_extern_crate: bool, 151 pub(super) is_extern_crate: bool,
152 pub(super) is_macro_use: bool, 152 pub(super) is_macro_use: bool,
153 pub(super) visibility: Visibility, 153 pub(super) visibility: RawVisibility,
154} 154}
155 155
156#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] 156#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
@@ -161,7 +161,7 @@ impl_arena_id!(Def);
161pub(super) struct DefData { 161pub(super) struct DefData {
162 pub(super) name: Name, 162 pub(super) name: Name,
163 pub(super) kind: DefKind, 163 pub(super) kind: DefKind,
164 pub(super) visibility: Visibility, 164 pub(super) visibility: RawVisibility,
165} 165}
166 166
167#[derive(Debug, PartialEq, Eq, Clone, Copy)] 167#[derive(Debug, PartialEq, Eq, Clone, Copy)]
@@ -232,7 +232,7 @@ impl RawItemsCollector {
232 232
233 fn add_item(&mut self, current_module: Option<Module>, item: ast::ModuleItem) { 233 fn add_item(&mut self, current_module: Option<Module>, item: ast::ModuleItem) {
234 let attrs = self.parse_attrs(&item); 234 let attrs = self.parse_attrs(&item);
235 let visibility = Visibility::from_ast_with_hygiene(item.visibility(), &self.hygiene); 235 let visibility = RawVisibility::from_ast_with_hygiene(item.visibility(), &self.hygiene);
236 let (kind, name) = match item { 236 let (kind, name) = match item {
237 ast::ModuleItem::Module(module) => { 237 ast::ModuleItem::Module(module) => {
238 self.add_module(current_module, module); 238 self.add_module(current_module, module);
@@ -292,7 +292,7 @@ impl RawItemsCollector {
292 None => return, 292 None => return,
293 }; 293 };
294 let attrs = self.parse_attrs(&module); 294 let attrs = self.parse_attrs(&module);
295 let visibility = Visibility::from_ast_with_hygiene(module.visibility(), &self.hygiene); 295 let visibility = RawVisibility::from_ast_with_hygiene(module.visibility(), &self.hygiene);
296 296
297 let ast_id = self.source_ast_id_map.ast_id(&module); 297 let ast_id = self.source_ast_id_map.ast_id(&module);
298 if module.has_semi() { 298 if module.has_semi() {
@@ -320,7 +320,7 @@ impl RawItemsCollector {
320 // FIXME: cfg_attr 320 // FIXME: cfg_attr
321 let is_prelude = use_item.has_atom_attr("prelude_import"); 321 let is_prelude = use_item.has_atom_attr("prelude_import");
322 let attrs = self.parse_attrs(&use_item); 322 let attrs = self.parse_attrs(&use_item);
323 let visibility = Visibility::from_ast_with_hygiene(use_item.visibility(), &self.hygiene); 323 let visibility = RawVisibility::from_ast_with_hygiene(use_item.visibility(), &self.hygiene);
324 324
325 let mut buf = Vec::new(); 325 let mut buf = Vec::new();
326 ModPath::expand_use_item( 326 ModPath::expand_use_item(
@@ -352,7 +352,7 @@ impl RawItemsCollector {
352 if let Some(name_ref) = extern_crate.name_ref() { 352 if let Some(name_ref) = extern_crate.name_ref() {
353 let path = ModPath::from_name_ref(&name_ref); 353 let path = ModPath::from_name_ref(&name_ref);
354 let visibility = 354 let visibility =
355 Visibility::from_ast_with_hygiene(extern_crate.visibility(), &self.hygiene); 355 RawVisibility::from_ast_with_hygiene(extern_crate.visibility(), &self.hygiene);
356 let alias = extern_crate.alias().and_then(|a| a.name()).map(|it| it.as_name()); 356 let alias = extern_crate.alias().and_then(|a| a.name()).map(|it| it.as_name());
357 let attrs = self.parse_attrs(&extern_crate); 357 let attrs = self.parse_attrs(&extern_crate);
358 // FIXME: cfg_attr 358 // FIXME: cfg_attr