rust-analyzer

diff --git a/crates/ide/src/call_hierarchy.rs b/crates/ide/src/call_hierarchy.rs
index 30614a9b49..b43de6b9e2 100644
--- a/crates/ide/src/call_hierarchy.rs
+++ b/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 {

diff --git a/crates/ide/src/display.rs b/crates/ide/src/display.rs
deleted file mode 100644
index 474db2e8de..0000000000
--- a/crates/ide/src/display.rs
+++ /dev/null

@@ -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};

diff --git a/crates/ide/src/doc_links.rs b/crates/ide/src/doc_links.rs
index 075c917225..d5dca95fba 100644
--- a/crates/ide/src/doc_links.rs
+++ b/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::*;

diff --git a/crates/ide/src/goto_definition.rs b/crates/ide/src/goto_definition.rs
index 77f90eee19..0e71d5ff6a 100644
--- a/crates/ide/src/goto_definition.rs
+++ b/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},

diff --git a/crates/ide/src/goto_implementation.rs b/crates/ide/src/goto_implementation.rs
index c9c7e232f2..775af2b66c 100644
--- a/crates/ide/src/goto_implementation.rs
+++ b/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

diff --git a/crates/ide/src/goto_type_definition.rs b/crates/ide/src/goto_type_definition.rs
index ce58f72a77..031c4af0de 100644
--- a/crates/ide/src/goto_type_definition.rs
+++ b/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

diff --git a/crates/ide/src/highlight_related.rs b/crates/ide/src/highlight_related.rs
index 7d4d52ff50..357b0d2455 100644
--- a/crates/ide/src/highlight_related.rs
+++ b/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 {

diff --git a/crates/ide/src/hover.rs b/crates/ide/src/hover.rs
index 8d24bdcf4f..7c098b13ae 100644
--- a/crates/ide/src/hover.rs
+++ b/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)]

diff --git a/crates/ide/src/lib.rs b/crates/ide/src/lib.rs
index bc447177af..df26869dba 100644
--- a/crates/ide/src/lib.rs
+++ b/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,

diff --git a/crates/ide/src/display/navigation_target.rs b/crates/ide/src/navigation_target.rs
index 3121cdd4a2..3121cdd4a2 100644
--- a/crates/ide/src/display/navigation_target.rs
+++ b/crates/ide/src/navigation_target.rs

diff --git a/crates/ide/src/references.rs b/crates/ide/src/references.rs
index 0e3b73d235..c5fe7d30c9 100644
--- a/crates/ide/src/references.rs
+++ b/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 {

diff --git a/crates/ide/src/runnables.rs b/crates/ide/src/runnables.rs
index b2111bc4ee..3078789d12 100644
--- a/crates/ide/src/runnables.rs
+++ b/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 {

diff --git a/crates/ide/src/static_index.rs b/crates/ide/src/static_index.rs
index 036839a801..e09683f689 100644
--- a/crates/ide/src/static_index.rs
+++ b/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.