diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-10-29 13:19:45 +0000 |
---|---|---|
committer | GitHub <[email protected]> | 2019-10-29 13:19:45 +0000 |
commit | e38cdf6e56d963525fcc656b80965e7114756496 (patch) | |
tree | 4ca01adaa4ade6e90d7bcf20748dd691cdb5151d /crates/ra_hir/src/expr | |
parent | e960414a4d2a654898e697d267a5d95eb93271a0 (diff) | |
parent | bca708ba4c5eb474448ef2f2882a66ec935f2fee (diff) |
Merge #2114
2114: Move macro expansion to a separate crate r=matklad a=matklad
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_hir/src/expr')
-rw-r--r-- | crates/ra_hir/src/expr/lower.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ra_hir/src/expr/lower.rs b/crates/ra_hir/src/expr/lower.rs index 24733b3de..b3a9a2e6b 100644 --- a/crates/ra_hir/src/expr/lower.rs +++ b/crates/ra_hir/src/expr/lower.rs | |||
@@ -465,7 +465,7 @@ where | |||
465 | 465 | ||
466 | if let Some(path) = e.path().and_then(|path| self.parse_path(path)) { | 466 | if let Some(path) = e.path().and_then(|path| self.parse_path(path)) { |
467 | if let Some(def) = self.resolver.resolve_path_as_macro(self.db, &path) { | 467 | if let Some(def) = self.resolver.resolve_path_as_macro(self.db, &path) { |
468 | let call_id = MacroCallLoc { def: def.id, ast_id }.id(self.db); | 468 | let call_id = self.db.intern_macro(MacroCallLoc { def: def.id, ast_id }); |
469 | let file_id = call_id.as_file(MacroFileKind::Expr); | 469 | let file_id = call_id.as_file(MacroFileKind::Expr); |
470 | if let Some(node) = self.db.parse_or_expand(file_id) { | 470 | if let Some(node) = self.db.parse_or_expand(file_id) { |
471 | if let Some(expr) = ast::Expr::cast(node) { | 471 | if let Some(expr) = ast::Expr::cast(node) { |