From 088f50c0ab351d5ac072547a47c1ce7eeae029f3 Mon Sep 17 00:00:00 2001
From: ice1000 <ice1000kotlin@foxmail.com>
Date: Wed, 4 Dec 2019 13:35:24 -0500
Subject: No block at the moment

---
 crates/ra_hir/src/from_source.rs               | 2 +-
 crates/ra_hir_def/src/nameres.rs               | 7 +------
 crates/ra_ide/src/display/navigation_target.rs | 1 -
 crates/ra_ide/src/references/rename.rs         | 2 +-
 crates/ra_ide/src/references/search_scope.rs   | 5 -----
 5 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/crates/ra_hir/src/from_source.rs b/crates/ra_hir/src/from_source.rs
index 67b127ba5..a46bba4f2 100644
--- a/crates/ra_hir/src/from_source.rs
+++ b/crates/ra_hir/src/from_source.rs
@@ -257,7 +257,7 @@ impl Module {
                     InFile { file_id: src.file_id, value: module.clone() },
                 );
             }
-            ModuleSource::SourceFile(_) | ModuleSource::Block(_) => (),
+            ModuleSource::SourceFile(_) => (),
         };
 
         let original_file = src.file_id.original_file(db);
diff --git a/crates/ra_hir_def/src/nameres.rs b/crates/ra_hir_def/src/nameres.rs
index ce318571c..f70235c99 100644
--- a/crates/ra_hir_def/src/nameres.rs
+++ b/crates/ra_hir_def/src/nameres.rs
@@ -109,7 +109,6 @@ pub enum ModuleOrigin {
     /// Note that non-inline modules, by definition, live inside non-macro file.
     File(AstId<ast::Module>, FileId),
     Inline(AstId<ast::Module>),
-    Block(AstId<ast::Block>),
 }
 
 impl Default for ModuleOrigin {
@@ -140,7 +139,7 @@ impl ModuleOrigin {
     pub fn declaration(&self) -> Option<AstId<ast::Module>> {
         match self {
             ModuleOrigin::File(m, _) | ModuleOrigin::Inline(m) => Some(*m),
-            ModuleOrigin::Root(_) | ModuleOrigin::Block(_) => None,
+            ModuleOrigin::Root(_) => None,
         }
     }
 
@@ -162,7 +161,6 @@ impl ModuleOrigin {
             }
             ModuleOrigin::Root(None) => unreachable!(),
             ModuleOrigin::Inline(m) => InFile::new(m.file_id, ModuleSource::Module(m.to_node(db))),
-            ModuleOrigin::Block(b) => InFile::new(b.file_id, ModuleSource::Block(b.to_node(db))),
         }
     }
 }
@@ -360,7 +358,6 @@ impl ModuleData {
 pub enum ModuleSource {
     SourceFile(ast::SourceFile),
     Module(ast::Module),
-    Block(ast::Block),
 }
 
 impl ModuleSource {
@@ -384,8 +381,6 @@ impl ModuleSource {
             child.value.ancestors().filter_map(ast::Module::cast).find(|it| !it.has_semi())
         {
             ModuleSource::Module(m)
-        } else if let Some(b) = child.value.ancestors().filter_map(ast::Block::cast).next() {
-            ModuleSource::Block(b)
         } else {
             let file_id = child.file_id.original_file(db);
             let source_file = db.parse(file_id).tree();
diff --git a/crates/ra_ide/src/display/navigation_target.rs b/crates/ra_ide/src/display/navigation_target.rs
index b376fcdae..add11fbc3 100644
--- a/crates/ra_ide/src/display/navigation_target.rs
+++ b/crates/ra_ide/src/display/navigation_target.rs
@@ -234,7 +234,6 @@ impl ToNav for hir::Module {
         let syntax = match &src.value {
             ModuleSource::SourceFile(node) => node.syntax(),
             ModuleSource::Module(node) => node.syntax(),
-            ModuleSource::Block(node) => node.syntax(),
         };
         let frange = original_range(db, src.with_value(syntax));
         NavigationTarget::from_syntax(
diff --git a/crates/ra_ide/src/references/rename.rs b/crates/ra_ide/src/references/rename.rs
index 1abf20215..b804d5f6d 100644
--- a/crates/ra_ide/src/references/rename.rs
+++ b/crates/ra_ide/src/references/rename.rs
@@ -88,7 +88,7 @@ fn rename_mod(
                     file_system_edits.push(move_file);
                 }
             }
-            ModuleSource::Module(..) | ModuleSource::Block(..) => {}
+            ModuleSource::Module(..) => {}
         }
     }
 
diff --git a/crates/ra_ide/src/references/search_scope.rs b/crates/ra_ide/src/references/search_scope.rs
index 92eb2015b..f5c9589f4 100644
--- a/crates/ra_ide/src/references/search_scope.rs
+++ b/crates/ra_ide/src/references/search_scope.rs
@@ -96,10 +96,6 @@ impl NameDefinition {
                         let range = Some(m.syntax().text_range());
                         res.insert(file_id, range);
                     }
-                    ModuleSource::Block(b) => {
-                        let range = Some(b.syntax().text_range());
-                        res.insert(file_id, range);
-                    }
                     ModuleSource::SourceFile(_) => {
                         res.insert(file_id, None);
                         res.extend(parent_module.children(db).map(|m| {
@@ -141,7 +137,6 @@ impl NameDefinition {
         let mut res = FxHashMap::default();
         let range = match module_src.value {
             ModuleSource::Module(m) => Some(m.syntax().text_range()),
-            ModuleSource::Block(b) => Some(b.syntax().text_range()),
             ModuleSource::SourceFile(_) => None,
         };
         res.insert(file_id, range);
-- 
cgit v1.2.3