diff options
author | arsdragonfly <[email protected]> | 2019-09-27 21:17:23 +0100 |
---|---|---|
committer | arsdragonfly <[email protected]> | 2019-09-27 21:17:23 +0100 |
commit | 84340db87aed477f61bf46ba5e4a75f3eb672237 (patch) | |
tree | af7fe4eb8045ccb1b73bcdcd80b3a729062bd308 /crates/ra_hir/src/impl_block.rs | |
parent | d1988a17f4ceb90bcdaed79072c4b7f647c86854 (diff) | |
parent | 21fa889cf3f70c507e3b9f2f6362e65cbb8ed955 (diff) |
Merge branch 'master' of https://github.com/rust-analyzer/rust-analyzer
Diffstat (limited to 'crates/ra_hir/src/impl_block.rs')
-rw-r--r-- | crates/ra_hir/src/impl_block.rs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/crates/ra_hir/src/impl_block.rs b/crates/ra_hir/src/impl_block.rs index d830202bd..c66a1c6a6 100644 --- a/crates/ra_hir/src/impl_block.rs +++ b/crates/ra_hir/src/impl_block.rs | |||
@@ -218,7 +218,10 @@ impl ModuleImplBlocks { | |||
218 | ast::ItemOrMacro::Macro(macro_call) => { | 218 | ast::ItemOrMacro::Macro(macro_call) => { |
219 | //FIXME: we should really cut down on the boilerplate required to process a macro | 219 | //FIXME: we should really cut down on the boilerplate required to process a macro |
220 | let ast_id = db.ast_id_map(file_id).ast_id(¯o_call).with_file_id(file_id); | 220 | let ast_id = db.ast_id_map(file_id).ast_id(¯o_call).with_file_id(file_id); |
221 | if let Some(path) = macro_call.path().and_then(Path::from_ast) { | 221 | if let Some(path) = macro_call |
222 | .path() | ||
223 | .and_then(|path| Path::from_src(Source { ast: path, file_id }, db)) | ||
224 | { | ||
222 | if let Some(def) = self.module.resolver(db).resolve_path_as_macro(db, &path) | 225 | if let Some(def) = self.module.resolver(db).resolve_path_as_macro(db, &path) |
223 | { | 226 | { |
224 | let call_id = MacroCallLoc { def: def.id, ast_id }.id(db); | 227 | let call_id = MacroCallLoc { def: def.id, ast_id }.id(db); |