diff options
Diffstat (limited to 'crates/ra_ide_api/src')
-rw-r--r-- | crates/ra_ide_api/src/display.rs | 4 | ||||
-rw-r--r-- | crates/ra_ide_api/src/display/navigation_target.rs (renamed from crates/ra_ide_api/src/navigation_target.rs) | 0 | ||||
-rw-r--r-- | crates/ra_ide_api/src/lib.rs | 4 | ||||
-rw-r--r-- | crates/ra_ide_api/src/symbol_index.rs | 2 |
4 files changed, 6 insertions, 4 deletions
diff --git a/crates/ra_ide_api/src/display.rs b/crates/ra_ide_api/src/display.rs index efadb9b10..f0c818933 100644 --- a/crates/ra_ide_api/src/display.rs +++ b/crates/ra_ide_api/src/display.rs | |||
@@ -7,6 +7,10 @@ use ra_syntax::{ast::{self, AstNode, NameOwner, VisibilityOwner, TypeParamsOwner | |||
7 | use std::convert::From; | 7 | use std::convert::From; |
8 | use hir::Docs; | 8 | use hir::Docs; |
9 | 9 | ||
10 | pub mod navigation_target; | ||
11 | |||
12 | pub use navigation_target::NavigationTarget; | ||
13 | |||
10 | pub(crate) fn function_label(node: &ast::FnDef) -> String { | 14 | pub(crate) fn function_label(node: &ast::FnDef) -> String { |
11 | FunctionSignature::from(node).to_string() | 15 | FunctionSignature::from(node).to_string() |
12 | } | 16 | } |
diff --git a/crates/ra_ide_api/src/navigation_target.rs b/crates/ra_ide_api/src/display/navigation_target.rs index f6d7f3192..f6d7f3192 100644 --- a/crates/ra_ide_api/src/navigation_target.rs +++ b/crates/ra_ide_api/src/display/navigation_target.rs | |||
diff --git a/crates/ra_ide_api/src/lib.rs b/crates/ra_ide_api/src/lib.rs index 816bab94f..d76012a8c 100644 --- a/crates/ra_ide_api/src/lib.rs +++ b/crates/ra_ide_api/src/lib.rs | |||
@@ -13,7 +13,6 @@ | |||
13 | mod db; | 13 | mod db; |
14 | pub mod mock_analysis; | 14 | pub mod mock_analysis; |
15 | mod symbol_index; | 15 | mod symbol_index; |
16 | mod navigation_target; | ||
17 | mod change; | 16 | mod change; |
18 | 17 | ||
19 | mod status; | 18 | mod status; |
@@ -63,7 +62,6 @@ pub use crate::{ | |||
63 | change::{AnalysisChange, LibraryData}, | 62 | change::{AnalysisChange, LibraryData}, |
64 | completion::{CompletionItem, CompletionItemKind, InsertTextFormat}, | 63 | completion::{CompletionItem, CompletionItemKind, InsertTextFormat}, |
65 | runnables::{Runnable, RunnableKind}, | 64 | runnables::{Runnable, RunnableKind}, |
66 | navigation_target::NavigationTarget, | ||
67 | references::ReferenceSearchResult, | 65 | references::ReferenceSearchResult, |
68 | assists::{Assist, AssistId}, | 66 | assists::{Assist, AssistId}, |
69 | hover::{HoverResult}, | 67 | hover::{HoverResult}, |
@@ -73,7 +71,7 @@ pub use crate::{ | |||
73 | syntax_highlighting::HighlightedRange, | 71 | syntax_highlighting::HighlightedRange, |
74 | structure::{StructureNode, file_structure}, | 72 | structure::{StructureNode, file_structure}, |
75 | diagnostics::Severity, | 73 | diagnostics::Severity, |
76 | display::FunctionSignature, | 74 | display::{FunctionSignature, NavigationTarget}, |
77 | }; | 75 | }; |
78 | 76 | ||
79 | pub use ra_db::{ | 77 | pub use ra_db::{ |
diff --git a/crates/ra_ide_api/src/symbol_index.rs b/crates/ra_ide_api/src/symbol_index.rs index 0eadc4e71..914d3fc71 100644 --- a/crates/ra_ide_api/src/symbol_index.rs +++ b/crates/ra_ide_api/src/symbol_index.rs | |||
@@ -275,7 +275,7 @@ fn to_file_symbol(node: &SyntaxNode, file_id: FileId) -> Option<FileSymbol> { | |||
275 | mod tests { | 275 | mod tests { |
276 | use ra_syntax::SmolStr; | 276 | use ra_syntax::SmolStr; |
277 | use crate::{ | 277 | use crate::{ |
278 | navigation_target::NavigationTarget, | 278 | display::NavigationTarget, |
279 | mock_analysis::single_file, | 279 | mock_analysis::single_file, |
280 | Query, | 280 | Query, |
281 | }; | 281 | }; |