rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Remove unnecessary to_nav_target

Browse Source
This commit is contained in:
Ville Penttinen
2019-02-23 14:08:57 +02:00
parent c565ec2d6e
commit 40e6cb196b
1 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
crates/ra_ide_api/src/goto_definition.rs
View File

@@ -1,6 +1,6 @@
use ra_db::{FileId, SourceDatabase}; use ra_db::{FileId, SourceDatabase};
use ra_syntax::{ use ra_syntax::{
AstNode, ast::{self, NameOwner}, AstNode, ast,
algo::{find_node_at_offset, visit::{visitor, Visitor}}, algo::{find_node_at_offset, visit::{visitor, Visitor}},
SyntaxNode, SyntaxNode,
}; };
@@ -136,22 +136,18 @@ fn name_definition(
} }
fn named_target(file_id: FileId, node: &SyntaxNode) -> Option<NavigationTarget> { fn named_target(file_id: FileId, node: &SyntaxNode) -> Option<NavigationTarget> {
fn to_nav_target<N: NameOwner>(node: &N, file_id: FileId) -> Option<NavigationTarget> {
Some(NavigationTarget::from_named(file_id, node))
}
visitor() visitor()
.visit(|n: &ast::StructDef| to_nav_target(n, file_id)) .visit(|node: &ast::StructDef| NavigationTarget::from_named(file_id, node))
.visit(|n: &ast::EnumDef| to_nav_target(n, file_id)) .visit(|node: &ast::EnumDef| NavigationTarget::from_named(file_id, node))
.visit(|n: &ast::EnumVariant| to_nav_target(n, file_id)) .visit(|node: &ast::EnumVariant| NavigationTarget::from_named(file_id, node))
.visit(|n: &ast::FnDef| to_nav_target(n, file_id)) .visit(|node: &ast::FnDef| NavigationTarget::from_named(file_id, node))
.visit(|n: &ast::TypeDef| to_nav_target(n, file_id)) .visit(|node: &ast::TypeDef| NavigationTarget::from_named(file_id, node))
.visit(|n: &ast::ConstDef| to_nav_target(n, file_id)) .visit(|node: &ast::ConstDef| NavigationTarget::from_named(file_id, node))
.visit(|n: &ast::StaticDef| to_nav_target(n, file_id)) .visit(|node: &ast::StaticDef| NavigationTarget::from_named(file_id, node))
.visit(|n: &ast::TraitDef| to_nav_target(n, file_id)) .visit(|node: &ast::TraitDef| NavigationTarget::from_named(file_id, node))
.visit(|n: &ast::NamedFieldDef| to_nav_target(n, file_id)) .visit(|node: &ast::NamedFieldDef| NavigationTarget::from_named(file_id, node))
.visit(|n: &ast::Module| to_nav_target(n, file_id)) .visit(|node: &ast::Module| NavigationTarget::from_named(file_id, node))
.accept(node)? .accept(node)
} }
#[cfg(test)] #[cfg(test)]