diff options
author | ice1000 <[email protected]> | 2019-12-04 18:35:24 +0000 |
---|---|---|
committer | ice1000 <[email protected]> | 2019-12-04 23:30:42 +0000 |
commit | 088f50c0ab351d5ac072547a47c1ce7eeae029f3 (patch) | |
tree | bb1debb530510bea0aa5333bbc3a6d2d0a1a3ac8 /crates/ra_hir_def/src | |
parent | 032eb3d68e07f087ac531d48f956a79948baa4b9 (diff) |
No block at the moment
Diffstat (limited to 'crates/ra_hir_def/src')
-rw-r--r-- | crates/ra_hir_def/src/nameres.rs | 7 |
1 files changed, 1 insertions, 6 deletions
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 { | |||
109 | /// Note that non-inline modules, by definition, live inside non-macro file. | 109 | /// Note that non-inline modules, by definition, live inside non-macro file. |
110 | File(AstId<ast::Module>, FileId), | 110 | File(AstId<ast::Module>, FileId), |
111 | Inline(AstId<ast::Module>), | 111 | Inline(AstId<ast::Module>), |
112 | Block(AstId<ast::Block>), | ||
113 | } | 112 | } |
114 | 113 | ||
115 | impl Default for ModuleOrigin { | 114 | impl Default for ModuleOrigin { |
@@ -140,7 +139,7 @@ impl ModuleOrigin { | |||
140 | pub fn declaration(&self) -> Option<AstId<ast::Module>> { | 139 | pub fn declaration(&self) -> Option<AstId<ast::Module>> { |
141 | match self { | 140 | match self { |
142 | ModuleOrigin::File(m, _) | ModuleOrigin::Inline(m) => Some(*m), | 141 | ModuleOrigin::File(m, _) | ModuleOrigin::Inline(m) => Some(*m), |
143 | ModuleOrigin::Root(_) | ModuleOrigin::Block(_) => None, | 142 | ModuleOrigin::Root(_) => None, |
144 | } | 143 | } |
145 | } | 144 | } |
146 | 145 | ||
@@ -162,7 +161,6 @@ impl ModuleOrigin { | |||
162 | } | 161 | } |
163 | ModuleOrigin::Root(None) => unreachable!(), | 162 | ModuleOrigin::Root(None) => unreachable!(), |
164 | ModuleOrigin::Inline(m) => InFile::new(m.file_id, ModuleSource::Module(m.to_node(db))), | 163 | ModuleOrigin::Inline(m) => InFile::new(m.file_id, ModuleSource::Module(m.to_node(db))), |
165 | ModuleOrigin::Block(b) => InFile::new(b.file_id, ModuleSource::Block(b.to_node(db))), | ||
166 | } | 164 | } |
167 | } | 165 | } |
168 | } | 166 | } |
@@ -360,7 +358,6 @@ impl ModuleData { | |||
360 | pub enum ModuleSource { | 358 | pub enum ModuleSource { |
361 | SourceFile(ast::SourceFile), | 359 | SourceFile(ast::SourceFile), |
362 | Module(ast::Module), | 360 | Module(ast::Module), |
363 | Block(ast::Block), | ||
364 | } | 361 | } |
365 | 362 | ||
366 | impl ModuleSource { | 363 | impl ModuleSource { |
@@ -384,8 +381,6 @@ impl ModuleSource { | |||
384 | child.value.ancestors().filter_map(ast::Module::cast).find(|it| !it.has_semi()) | 381 | child.value.ancestors().filter_map(ast::Module::cast).find(|it| !it.has_semi()) |
385 | { | 382 | { |
386 | ModuleSource::Module(m) | 383 | ModuleSource::Module(m) |
387 | } else if let Some(b) = child.value.ancestors().filter_map(ast::Block::cast).next() { | ||
388 | ModuleSource::Block(b) | ||
389 | } else { | 384 | } else { |
390 | let file_id = child.file_id.original_file(db); | 385 | let file_id = child.file_id.original_file(db); |
391 | let source_file = db.parse(file_id).tree(); | 386 | let source_file = db.parse(file_id).tree(); |