mirror of
https://github.com/rust-lang/rust-analyzer.git
synced 2025-09-30 22:01:37 +00:00
internal: remove unused param
This commit is contained in:
parent
5021f10660
commit
1171dc74e0
9 changed files with 13 additions and 15 deletions
|
@ -112,7 +112,7 @@ pub(crate) fn external_docs(
|
||||||
let node = token.parent()?;
|
let node = token.parent()?;
|
||||||
let definition = match_ast! {
|
let definition = match_ast! {
|
||||||
match node {
|
match node {
|
||||||
ast::NameRef(name_ref) => NameRefClass::classify(&sema, &name_ref).map(|d| d.referenced(sema.db))?,
|
ast::NameRef(name_ref) => NameRefClass::classify(&sema, &name_ref).map(|d| d.referenced())?,
|
||||||
ast::Name(name) => NameClass::classify(&sema, &name).map(|d| d.referenced_or_defined(sema.db))?,
|
ast::Name(name) => NameClass::classify(&sema, &name).map(|d| d.referenced_or_defined(sema.db))?,
|
||||||
_ => return None,
|
_ => return None,
|
||||||
}
|
}
|
||||||
|
|
|
@ -25,7 +25,7 @@ pub(crate) fn goto_declaration(
|
||||||
match parent {
|
match parent {
|
||||||
ast::NameRef(name_ref) => {
|
ast::NameRef(name_ref) => {
|
||||||
let name_kind = NameRefClass::classify(&sema, &name_ref)?;
|
let name_kind = NameRefClass::classify(&sema, &name_ref)?;
|
||||||
name_kind.referenced(sema.db)
|
name_kind.referenced()
|
||||||
},
|
},
|
||||||
ast::Name(name) => {
|
ast::Name(name) => {
|
||||||
NameClass::classify(&sema, &name)?.referenced_or_defined(sema.db)
|
NameClass::classify(&sema, &name)?.referenced_or_defined(sema.db)
|
||||||
|
|
|
@ -140,7 +140,7 @@ pub(crate) fn reference_definition(
|
||||||
|lifetime| NameRefClass::classify_lifetime(sema, lifetime),
|
|lifetime| NameRefClass::classify_lifetime(sema, lifetime),
|
||||||
|name_ref| NameRefClass::classify(sema, name_ref),
|
|name_ref| NameRefClass::classify(sema, name_ref),
|
||||||
)?;
|
)?;
|
||||||
let def = name_kind.referenced(sema.db);
|
let def = name_kind.referenced();
|
||||||
def.try_to_nav(sema.db)
|
def.try_to_nav(sema.db)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -32,7 +32,7 @@ pub(crate) fn goto_implementation(
|
||||||
NameClass::classify(&sema, name).map(|class| class.referenced_or_defined(sema.db))
|
NameClass::classify(&sema, name).map(|class| class.referenced_or_defined(sema.db))
|
||||||
}
|
}
|
||||||
ast::NameLike::NameRef(name_ref) => {
|
ast::NameLike::NameRef(name_ref) => {
|
||||||
NameRefClass::classify(&sema, name_ref).map(|class| class.referenced(sema.db))
|
NameRefClass::classify(&sema, name_ref).map(|class| class.referenced())
|
||||||
}
|
}
|
||||||
ast::NameLike::Lifetime(_) => None,
|
ast::NameLike::Lifetime(_) => None,
|
||||||
}?;
|
}?;
|
||||||
|
|
|
@ -101,10 +101,10 @@ pub(crate) fn hover(
|
||||||
def => def.defined(db),
|
def => def.defined(db),
|
||||||
}),
|
}),
|
||||||
ast::NameRef(name_ref) => {
|
ast::NameRef(name_ref) => {
|
||||||
NameRefClass::classify(&sema, &name_ref).map(|d| d.referenced(db))
|
NameRefClass::classify(&sema, &name_ref).map(|d| d.referenced())
|
||||||
},
|
},
|
||||||
ast::Lifetime(lifetime) => NameClass::classify_lifetime(&sema, &lifetime).map_or_else(
|
ast::Lifetime(lifetime) => NameClass::classify_lifetime(&sema, &lifetime).map_or_else(
|
||||||
|| NameRefClass::classify_lifetime(&sema, &lifetime).map(|d| d.referenced(db)),
|
|| NameRefClass::classify_lifetime(&sema, &lifetime).map(|d| d.referenced()),
|
||||||
|d| d.defined(db),
|
|d| d.defined(db),
|
||||||
),
|
),
|
||||||
|
|
||||||
|
|
|
@ -116,14 +116,12 @@ pub(crate) fn find_def(
|
||||||
offset: TextSize,
|
offset: TextSize,
|
||||||
) -> Option<Definition> {
|
) -> Option<Definition> {
|
||||||
let def = match sema.find_node_at_offset_with_descend(syntax, offset)? {
|
let def = match sema.find_node_at_offset_with_descend(syntax, offset)? {
|
||||||
ast::NameLike::NameRef(name_ref) => {
|
ast::NameLike::NameRef(name_ref) => NameRefClass::classify(sema, &name_ref)?.referenced(),
|
||||||
NameRefClass::classify(sema, &name_ref)?.referenced(sema.db)
|
|
||||||
}
|
|
||||||
ast::NameLike::Name(name) => {
|
ast::NameLike::Name(name) => {
|
||||||
NameClass::classify(sema, &name)?.referenced_or_defined(sema.db)
|
NameClass::classify(sema, &name)?.referenced_or_defined(sema.db)
|
||||||
}
|
}
|
||||||
ast::NameLike::Lifetime(lifetime) => NameRefClass::classify_lifetime(sema, &lifetime)
|
ast::NameLike::Lifetime(lifetime) => NameRefClass::classify_lifetime(sema, &lifetime)
|
||||||
.map(|class| class.referenced(sema.db))
|
.map(|class| class.referenced())
|
||||||
.or_else(|| {
|
.or_else(|| {
|
||||||
NameClass::classify_lifetime(sema, &lifetime)
|
NameClass::classify_lifetime(sema, &lifetime)
|
||||||
.map(|class| class.referenced_or_defined(sema.db))
|
.map(|class| class.referenced_or_defined(sema.db))
|
||||||
|
|
|
@ -112,7 +112,7 @@ fn find_definition(
|
||||||
}
|
}
|
||||||
ast::NameLike::NameRef(name_ref) => {
|
ast::NameLike::NameRef(name_ref) => {
|
||||||
if let Some(def) =
|
if let Some(def) =
|
||||||
NameRefClass::classify(sema, &name_ref).map(|class| class.referenced(sema.db))
|
NameRefClass::classify(sema, &name_ref).map(|class| class.referenced())
|
||||||
{
|
{
|
||||||
// if the name differs from the definitions name it has to be an alias
|
// if the name differs from the definitions name it has to be an alias
|
||||||
if def.name(sema.db).map_or(false, |it| it.to_string() != name_ref.text()) {
|
if def.name(sema.db).map_or(false, |it| it.to_string() != name_ref.text()) {
|
||||||
|
@ -124,7 +124,7 @@ fn find_definition(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
ast::NameLike::Lifetime(lifetime) => NameRefClass::classify_lifetime(sema, &lifetime)
|
ast::NameLike::Lifetime(lifetime) => NameRefClass::classify_lifetime(sema, &lifetime)
|
||||||
.map(|class| NameRefClass::referenced(class, sema.db))
|
.map(|class| class.referenced())
|
||||||
.or_else(|| {
|
.or_else(|| {
|
||||||
NameClass::classify_lifetime(sema, &lifetime)
|
NameClass::classify_lifetime(sema, &lifetime)
|
||||||
.map(|it| it.referenced_or_defined(sema.db))
|
.map(|it| it.referenced_or_defined(sema.db))
|
||||||
|
|
|
@ -638,7 +638,7 @@ fn vars_used_in_body(ctx: &AssistContext, body: &FunctionBody) -> Vec<Local> {
|
||||||
body.descendants()
|
body.descendants()
|
||||||
.filter_map(ast::NameRef::cast)
|
.filter_map(ast::NameRef::cast)
|
||||||
.filter_map(|name_ref| NameRefClass::classify(&ctx.sema, &name_ref))
|
.filter_map(|name_ref| NameRefClass::classify(&ctx.sema, &name_ref))
|
||||||
.map(|name_kind| name_kind.referenced(ctx.db()))
|
.map(|name_kind| name_kind.referenced())
|
||||||
.filter_map(|definition| match definition {
|
.filter_map(|definition| match definition {
|
||||||
Definition::Local(local) => Some(local),
|
Definition::Local(local) => Some(local),
|
||||||
_ => None,
|
_ => None,
|
||||||
|
|
|
@ -186,7 +186,7 @@ impl NameClass {
|
||||||
})
|
})
|
||||||
.and_then(|name_ref| NameRefClass::classify(sema, &name_ref))?;
|
.and_then(|name_ref| NameRefClass::classify(sema, &name_ref))?;
|
||||||
|
|
||||||
Some(NameClass::Definition(name_ref_class.referenced(sema.db)))
|
Some(NameClass::Definition(name_ref_class.referenced()))
|
||||||
} else {
|
} else {
|
||||||
let extern_crate = it.syntax().parent().and_then(ast::ExternCrate::cast)?;
|
let extern_crate = it.syntax().parent().and_then(ast::ExternCrate::cast)?;
|
||||||
let resolved = sema.resolve_extern_crate(&extern_crate)?;
|
let resolved = sema.resolve_extern_crate(&extern_crate)?;
|
||||||
|
@ -309,7 +309,7 @@ pub enum NameRefClass {
|
||||||
|
|
||||||
impl NameRefClass {
|
impl NameRefClass {
|
||||||
/// `Definition`, which this name refers to.
|
/// `Definition`, which this name refers to.
|
||||||
pub fn referenced(self, _db: &dyn HirDatabase) -> Definition {
|
pub fn referenced(self) -> Definition {
|
||||||
match self {
|
match self {
|
||||||
NameRefClass::Definition(def) => def,
|
NameRefClass::Definition(def) => def,
|
||||||
NameRefClass::FieldShorthand { local_ref, field_ref: _ } => {
|
NameRefClass::FieldShorthand { local_ref, field_ref: _ } => {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue