diff options
| author | bors <bors@rust-lang.org> | 2019-09-03 19:17:28 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-09-03 19:17:28 +0000 |
| commit | d097af105526a8defe413c64d79766333bb2085b (patch) | |
| tree | 7fde58f97eaf6a4a4c9581871410644f83774a82 /src/libsyntax/ext/expand.rs | |
| parent | 72bfc375356b56933955e07471f91ef97dceaa94 (diff) | |
| parent | 5f51210cc08b466d5ebc53448c8b150c82b0ef80 (diff) | |
| download | rust-d097af105526a8defe413c64d79766333bb2085b.tar.gz rust-d097af105526a8defe413c64d79766333bb2085b.zip | |
Auto merge of #64097 - pietroalbini:beta-rollup, r=pietroalbini
[beta] Rollup backports Rolled up: * [beta] Utilize released stable over dev-static #64046 Cherry picked: * Update rust-installer to limit memory use #63984 * debuginfo: give unique names to closure and generator types #63875 * ci: move libc mirrors to the rust-lang-ci-mirrors bucket #63772 * Fix nested eager expansions in arguments of `format_args` #63717 r? @ghost
Diffstat (limited to 'src/libsyntax/ext/expand.rs')
| -rw-r--r-- | src/libsyntax/ext/expand.rs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/libsyntax/ext/expand.rs b/src/libsyntax/ext/expand.rs index 9a3195b1165..cf1ae3e3164 100644 --- a/src/libsyntax/ext/expand.rs +++ b/src/libsyntax/ext/expand.rs @@ -331,7 +331,6 @@ impl<'a, 'b> MacroExpander<'a, 'b> { progress = true; let ExpansionData { depth, id: expn_id, .. } = invoc.expansion_data; self.cx.current_expansion = invoc.expansion_data.clone(); - self.cx.current_expansion.id = scope; // FIXME(jseyfried): Refactor out the following logic let (expanded_fragment, new_invocations) = if let Some(ext) = ext { |