Merge #10831

10831: minor: Unnest `ide::display::navigation_target` module r=Veykril a=Veykril

This module contained multiple submodules before, but those were removed some time ago so there is no point in having this one module two layers deep anymore.
bors r+

Co-authored-by: Lukas Wirth <lukastw97@gmail.com>

crates/ide/src/call_hierarchy.rs

@@ -9,7 +9,7 @@ use ide_db::{
 };
 use syntax::{ast, AstNode, SyntaxKind::NAME, TextRange};
 
-use crate::{display::TryToNav, goto_definition, FilePosition, NavigationTarget, RangeInfo};
+use crate::{goto_definition, FilePosition, NavigationTarget, RangeInfo, TryToNav};
 
 #[derive(Debug, Clone)]
 pub struct CallItem {

crates/ide/src/display.rs

@@ -1,5 +0,0 @@
-//! This module contains utilities for turning SyntaxNodes and HIR types
-//! into types that may be used to render in a UI.
-
-pub(crate) mod navigation_target;
-pub(crate) use navigation_target::{ToNav, TryToNav};

crates/ide/src/doc_links.rs

@@ -531,7 +531,7 @@ mod tests {
     use ide_db::base_db::FileRange;
     use itertools::Itertools;
 
-    use crate::{display::TryToNav, fixture};
+    use crate::{fixture, TryToNav};
 
     use super::*;
 

crates/ide/src/goto_definition.rs

@@ -1,8 +1,6 @@
 use std::convert::TryInto;
 
-use crate::{
-    display::TryToNav, doc_links::token_as_doc_comment, FilePosition, NavigationTarget, RangeInfo,
-};
+use crate::{doc_links::token_as_doc_comment, FilePosition, NavigationTarget, RangeInfo, TryToNav};
 use hir::{AsAssocItem, Semantics};
 use ide_db::{
     base_db::{AnchoredPath, FileId, FileLoader},

crates/ide/src/goto_implementation.rs

@@ -7,7 +7,7 @@ use ide_db::{
 use itertools::Itertools;
 use syntax::{ast, AstNode, SyntaxKind::*, T};
 
-use crate::{display::TryToNav, FilePosition, NavigationTarget, RangeInfo};
+use crate::{FilePosition, NavigationTarget, RangeInfo, TryToNav};
 
 // Feature: Go to Implementation
 //

crates/ide/src/goto_type_definition.rs

@@ -1,7 +1,7 @@
 use ide_db::{base_db::Upcast, defs::Definition, helpers::pick_best_token, RootDatabase};
 use syntax::{ast, match_ast, AstNode, SyntaxKind::*, SyntaxToken, T};
 
-use crate::{display::TryToNav, FilePosition, NavigationTarget, RangeInfo};
+use crate::{FilePosition, NavigationTarget, RangeInfo, TryToNav};
 
 // Feature: Go to Type Definition
 //

crates/ide/src/highlight_related.rs

@@ -14,7 +14,7 @@ use syntax::{
     SyntaxNode, SyntaxToken, TextRange, T,
 };
 
-use crate::{display::TryToNav, references, NavigationTarget};
+use crate::{references, NavigationTarget, TryToNav};
 
 #[derive(PartialEq, Eq, Hash)]
 pub struct HighlightedRange {

crates/ide/src/hover.rs

@@ -17,11 +17,10 @@ use itertools::Itertools;
 use syntax::{ast, match_ast, AstNode, SyntaxKind::*, SyntaxNode, SyntaxToken, T};
 
 use crate::{
-    display::TryToNav,
     doc_links::token_as_doc_comment,
     markup::Markup,
     runnables::{runnable_fn, runnable_mod},
-    FileId, FilePosition, NavigationTarget, RangeInfo, Runnable,
+    FileId, FilePosition, NavigationTarget, RangeInfo, Runnable, TryToNav,
 };
 
 #[derive(Clone, Debug, PartialEq, Eq)]

crates/ide/src/lib.rs

@@ -20,7 +20,7 @@ mod fixture;
 
 mod markup;
 mod prime_caches;
-mod display;
+mod navigation_target;
 
 mod annotations;
 mod call_hierarchy;
@@ -68,12 +68,11 @@ use ide_db::{
 };
 use syntax::SourceFile;
 
-use crate::display::ToNav;
+use crate::navigation_target::{ToNav, TryToNav};
 
 pub use crate::{
     annotations::{Annotation, AnnotationConfig, AnnotationKind},
     call_hierarchy::CallItem,
-    display::navigation_target::NavigationTarget,
     expand_macro::ExpandedMacro,
     file_structure::{StructureNode, StructureNodeKind},
     folding_ranges::{Fold, FoldKind},
@@ -83,6 +82,7 @@ pub use crate::{
     join_lines::JoinLinesConfig,
     markup::Markup,
     move_item::Direction,
+    navigation_target::NavigationTarget,
     prime_caches::PrimeCachesProgress,
     references::ReferenceSearchResult,
     rename::RenameError,

crates/ide/src/references.rs

@@ -23,7 +23,7 @@ use syntax::{
     match_ast, AstNode, SyntaxNode, TextRange, TextSize, T,
 };
 
-use crate::{display::TryToNav, FilePosition, NavigationTarget};
+use crate::{FilePosition, NavigationTarget, TryToNav};
 
 #[derive(Debug, Clone)]
 pub struct ReferenceSearchResult {

crates/ide/src/runnables.rs

@@ -19,10 +19,7 @@ use syntax::{
     SmolStr, SyntaxNode,
 };
 
-use crate::{
-    display::{ToNav, TryToNav},
-    references, FileId, NavigationTarget,
-};
+use crate::{references, FileId, NavigationTarget, ToNav, TryToNav};
 
 #[derive(Debug, Clone, Hash, PartialEq, Eq)]
 pub struct Runnable {

crates/ide/src/static_index.rs

@@ -12,10 +12,9 @@ use rustc_hash::FxHashSet;
 use syntax::{AstNode, SyntaxKind::*, T};
 use syntax::{SyntaxToken, TextRange};
 
-use crate::display::TryToNav;
 use crate::hover::hover_for_definition;
 use crate::{
-    Analysis, Fold, HoverConfig, HoverDocFormat, HoverResult, InlayHint, InlayHintsConfig,
+    Analysis, Fold, HoverConfig, HoverDocFormat, HoverResult, InlayHint, InlayHintsConfig, TryToNav,
 };
 
 /// A static representation of fully analyzed source code.