Move ReferenceKind

crates/ra_ide/src/references.rs

@@ -31,7 +31,7 @@ use crate::{display::TryToNav, FilePosition, FileRange, NavigationTarget, RangeI
 
 pub(crate) use self::rename::rename;
 
-pub use ra_ide_db::search::SearchScope;
+pub use ra_ide_db::search::{Reference, ReferenceAccess, ReferenceKind, SearchScope};
 
 #[derive(Debug, Clone)]
 pub struct ReferenceSearchResult {
@@ -46,25 +46,6 @@ pub struct Declaration {
     pub access: Option<ReferenceAccess>,
 }
 
-#[derive(Debug, Clone)]
-pub struct Reference {
-    pub file_range: FileRange,
-    pub kind: ReferenceKind,
-    pub access: Option<ReferenceAccess>,
-}
-
-#[derive(Debug, Clone, PartialEq)]
-pub enum ReferenceKind {
-    StructLiteral,
-    Other,
-}
-
-#[derive(Debug, Copy, Clone, PartialEq)]
-pub enum ReferenceAccess {
-    Read,
-    Write,
-}
-
 impl ReferenceSearchResult {
     pub fn declaration(&self) -> &Declaration {
         &self.declaration

crates/ra_ide_db/src/search.rs

@@ -5,13 +5,32 @@
 use std::mem;
 
 use hir::{DefWithBody, HasSource, ModuleSource};
-use ra_db::{FileId, SourceDatabaseExt};
+use ra_db::{FileId, FileRange, SourceDatabaseExt};
 use ra_prof::profile;
 use ra_syntax::{AstNode, TextRange};
 use rustc_hash::FxHashMap;
 
 use crate::{defs::Definition, RootDatabase};
 
+#[derive(Debug, Clone)]
+pub struct Reference {
+    pub file_range: FileRange,
+    pub kind: ReferenceKind,
+    pub access: Option<ReferenceAccess>,
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub enum ReferenceKind {
+    StructLiteral,
+    Other,
+}
+
+#[derive(Debug, Copy, Clone, PartialEq)]
+pub enum ReferenceAccess {
+    Read,
+    Write,
+}
+
 pub struct SearchScope {
     entries: FxHashMap<FileId, Option<TextRange>>,
 }