nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-06-04 19:29:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor: address review comments

Browse Source
This commit is contained in:
Aleksey Kladov 2021-07-20 17:49:02 +03:00
parent 7ec8434674
commit 60e7c1de83
4 changed files with 32 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
crates/hir/src/lib.rs
View File

@ -346,6 +346,22 @@ impl ModuleDef {
} }
} }
impl HasVisibility for ModuleDef {
fn visibility(&self, db: &dyn HirDatabase) -> Visibility {
match *self {
ModuleDef::Module(it) => it.visibility(db),
ModuleDef::Function(it) => it.visibility(db),
ModuleDef::Adt(it) => it.visibility(db),
ModuleDef::Const(it) => it.visibility(db),
ModuleDef::Static(it) => it.visibility(db),
ModuleDef::Trait(it) => it.visibility(db),
ModuleDef::TypeAlias(it) => it.visibility(db),
ModuleDef::Variant(it) => it.visibility(db),
ModuleDef::BuiltinType(_) => Visibility::Public,
}
}
}
impl Module { impl Module {
/// Name of this module. /// Name of this module.
pub fn name(self, db: &dyn HirDatabase) -> Option<Name> { pub fn name(self, db: &dyn HirDatabase) -> Option<Name> {

28
crates/ide_assists/src/handlers/expand_glob_import.rs
View File

@ -809,22 +809,22 @@ fn baz(bar: Bar) {}
", ",
); );
// check_assist_not_applicable( check_assist_not_applicable(
// expand_glob_import, expand_glob_import,
// r" r"
// mod foo { mod foo {
// mod bar { mod bar {
// pub mod baz { pub mod baz {
// pub struct Baz; pub struct Baz;
// } }
// } }
// } }
// use foo::bar::baz::*$0; use foo::bar::baz::*$0;
// fn qux(baz: Baz) {} fn qux(baz: Baz) {}
// ", ",
// ); );
} }
#[test] #[test]

13
crates/ide_assists/src/handlers/fix_visibility.rs
View File

@ -46,18 +46,7 @@ fn add_vis_to_referenced_module_def(acc: &mut Assists, ctx: &AssistContext) -> O
let current_module = ctx.sema.scope(path.syntax()).module()?; let current_module = ctx.sema.scope(path.syntax()).module()?;
let target_module = def.module(ctx.db())?; let target_module = def.module(ctx.db())?;
let vis = match def { if def.visibility(ctx.db()).is_visible_from(ctx.db(), current_module.into()) {
hir::ModuleDef::Module(it) => it.visibility(ctx.db()),
hir::ModuleDef::Function(it) => it.visibility(ctx.db()),
hir::ModuleDef::Adt(it) => it.visibility(ctx.db()),
hir::ModuleDef::Variant(it) => it.visibility(ctx.db()),
hir::ModuleDef::Const(it) => it.visibility(ctx.db()),
hir::ModuleDef::Static(it) => it.visibility(ctx.db()),
hir::ModuleDef::Trait(it) => it.visibility(ctx.db()),
hir::ModuleDef::TypeAlias(it) => it.visibility(ctx.db()),
hir::ModuleDef::BuiltinType(_) => return None,
};
if vis.is_visible_from(ctx.db(), current_module.into()) {
return None; return None;
}; };

12
crates/ide_db/src/defs.rs
View File

@ -44,17 +44,7 @@ impl Definition {
pub fn visibility(&self, db: &RootDatabase) -> Option<Visibility> { pub fn visibility(&self, db: &RootDatabase) -> Option<Visibility> {
match self { match self {
Definition::Field(sf) => Some(sf.visibility(db)), Definition::Field(sf) => Some(sf.visibility(db)),
Definition::ModuleDef(def) => match def { Definition::ModuleDef(def) => Some(def.visibility(db)),
ModuleDef::Module(it) => Some(it.visibility(db)),
ModuleDef::Function(it) => Some(it.visibility(db)),
ModuleDef::Adt(it) => Some(it.visibility(db)),
ModuleDef::Const(it) => Some(it.visibility(db)),
ModuleDef::Static(it) => Some(it.visibility(db)),
ModuleDef::Trait(it) => Some(it.visibility(db)),
ModuleDef::TypeAlias(it) => Some(it.visibility(db)),
ModuleDef::Variant(it) => Some(it.visibility(db)),
ModuleDef::BuiltinType(_) => None,
},
Definition::Macro(_) Definition::Macro(_)
| Definition::SelfType(_) | Definition::SelfType(_)
| Definition::Local(_) | Definition::Local(_)