language-servers/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-02 22:54:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

simplify

Browse source
This commit is contained in:
Aleksey Kladov 2019-01-11 13:31:21 +03:00
parent a5dd04078e
commit 1d3d05d5d7
1 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

7
crates/ra_ide_api/src/navigation_target.rs
View file

@ -46,7 +46,7 @@ impl NavigationTarget {
let name = m let name = m
.name(db)? .name(db)?
.map(|it| it.to_string().into()) .map(|it| it.to_string().into())
.unwrap_or_else(|| SmolStr::new("")); .unwrap_or_default();
match source { match source {
ModuleSource::SourceFile(node) => { ModuleSource::SourceFile(node) => {
NavigationTarget::from_syntax(file_id, name, node.syntax()) NavigationTarget::from_syntax(file_id, name, node.syntax())
@ -62,10 +62,7 @@ impl NavigationTarget {
} }
fn from_named(file_id: FileId, node: &impl ast::NameOwner) -> NavigationTarget { fn from_named(file_id: FileId, node: &impl ast::NameOwner) -> NavigationTarget {
let name = node let name = node.name().map(|it| it.text().clone()).unwrap_or_default();
.name()
.map(|it| it.text().clone())
.unwrap_or_else(|| SmolStr::new(""));
NavigationTarget::from_syntax(file_id, name, node.syntax()) NavigationTarget::from_syntax(file_id, name, node.syntax())
} }