From 328be5721ad0d53d6d296fec08fbcc569634ecf7 Mon Sep 17 00:00:00 2001
From: Ekaterina Babshukova <ekaterina.babshukova@yandex.ru>
Date: Mon, 14 Oct 2019 15:49:32 +0300
Subject: remove SearchScope

---
 crates/ra_ide_api/src/references/search_scope.rs | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

(limited to 'crates/ra_ide_api/src/references/search_scope.rs')

diff --git a/crates/ra_ide_api/src/references/search_scope.rs b/crates/ra_ide_api/src/references/search_scope.rs
index aae9db13b..dfea18a19 100644
--- a/crates/ra_ide_api/src/references/search_scope.rs
+++ b/crates/ra_ide_api/src/references/search_scope.rs
@@ -8,12 +8,8 @@ use crate::db::RootDatabase;
 
 use super::{NameDefinition, NameKind};
 
-pub(crate) struct SearchScope {
-    pub files: Vec<(FileId, Option<TextRange>)>,
-}
-
 impl NameDefinition {
-    pub(crate) fn scope(&self, db: &RootDatabase) -> SearchScope {
+    pub(crate) fn search_scope(&self, db: &RootDatabase) -> Vec<(FileId, Option<TextRange>)> {
         let module_src = self.container.definition_source(db);
         let file_id = module_src.file_id.original_file(db);
 
@@ -23,7 +19,7 @@ impl NameDefinition {
                 DefWithBody::Const(c) => c.source(db).ast.syntax().text_range(),
                 DefWithBody::Static(s) => s.source(db).ast.syntax().text_range(),
             };
-            return SearchScope { files: vec![(file_id, Some(range))] };
+            return vec![(file_id, Some(range))];
         }
 
         if let Some(ref vis) = self.visibility {
@@ -32,7 +28,7 @@ impl NameDefinition {
             let mut files = source_root.walk().map(|id| (id.into(), None)).collect::<Vec<_>>();
 
             if vis.syntax().to_string().as_str() == "pub(crate)" {
-                return SearchScope { files };
+                return files;
             }
             if vis.syntax().to_string().as_str() == "pub" {
                 let krate = self.container.krate(db).unwrap();
@@ -49,7 +45,7 @@ impl NameDefinition {
                     }
                 }
 
-                return SearchScope { files };
+                return files;
             }
             // FIXME: "pub(super)", "pub(in path)"
         }
@@ -58,6 +54,6 @@ impl NameDefinition {
             ModuleSource::Module(m) => Some(m.syntax().text_range()),
             ModuleSource::SourceFile(_) => None,
         };
-        SearchScope { files: vec![(file_id, range)] }
+        vec![(file_id, range)]
     }
 }
-- 
cgit v1.2.3