diff options
| author | Benjamin Coenen <[email protected]> | 2020-05-02 19:27:02 +0100 |
|---|---|---|
| committer | Benjamin Coenen <[email protected]> | 2020-05-02 19:27:02 +0100 |
| commit | 4613497a7714c6cd87166e6525d764d75f8acefd (patch) | |
| tree | 2527ae2c0ef2ef100efee3fcb8899f8e34d0d573 /crates/ra_hir/src/semantics | |
| parent | 19e28888aa41b2845b47adb7314aed99d3c48679 (diff) | |
| parent | 89e1f97515c36ab97bd378d972cabec0feb6d77e (diff) | |
Merge branch 'master' of github.com:rust-analyzer/rust-analyzer into fix_4202
Diffstat (limited to 'crates/ra_hir/src/semantics')
| -rw-r--r-- | crates/ra_hir/src/semantics/source_to_def.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ra_hir/src/semantics/source_to_def.rs b/crates/ra_hir/src/semantics/source_to_def.rs index 6f3b5b2da..8af64fdc1 100644 --- a/crates/ra_hir/src/semantics/source_to_def.rs +++ b/crates/ra_hir/src/semantics/source_to_def.rs | |||
| @@ -151,7 +151,7 @@ impl SourceToDefCtx<'_, '_> { | |||
| 151 | let krate = self.file_to_def(file_id)?.krate; | 151 | let krate = self.file_to_def(file_id)?.krate; |
| 152 | let file_ast_id = self.db.ast_id_map(src.file_id).ast_id(&src.value); | 152 | let file_ast_id = self.db.ast_id_map(src.file_id).ast_id(&src.value); |
| 153 | let ast_id = Some(AstId::new(src.file_id, file_ast_id)); | 153 | let ast_id = Some(AstId::new(src.file_id, file_ast_id)); |
| 154 | Some(MacroDefId { krate: Some(krate), ast_id, kind }) | 154 | Some(MacroDefId { krate: Some(krate), ast_id, kind, local_inner: false }) |
| 155 | } | 155 | } |
| 156 | 156 | ||
| 157 | pub(super) fn find_container(&mut self, src: InFile<&SyntaxNode>) -> Option<ChildContainer> { | 157 | pub(super) fn find_container(&mut self, src: InFile<&SyntaxNode>) -> Option<ChildContainer> { |