diff options
| author | Dylan DPC <dylan.dpc@gmail.com> | 2020-04-14 23:29:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-14 23:29:58 +0200 |
| commit | d5aff41167270b45fd14ccb65e51b81713f0539e (patch) | |
| tree | eca2e3813fed018f901dc35e85c07c1a6a8cdb6e | |
| parent | 6b8fb7c48a05241a6f7e8e8ee4ea656739f87a80 (diff) | |
| parent | a0d4c743ab7333af236e985d4e076cdc85249cf9 (diff) | |
| download | rust-d5aff41167270b45fd14ccb65e51b81713f0539e.tar.gz rust-d5aff41167270b45fd14ccb65e51b81713f0539e.zip | |
Rollup merge of #71128 - Mark-Simulacrum:clean-expansion, r=petrochenkov
Remove unused single_step flag This appears to have never been used ever since its introduction in 61c7569d4 -- the plugin discussed on the PR introducing that commit, 34811, never materialized. It's also simple to re-add in the current scheme, but given that macro expansion is already quite complicated, additional useless state seems good to remove while we're not using it.
| -rw-r--r-- | src/librustc_expand/expand.rs | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/librustc_expand/expand.rs b/src/librustc_expand/expand.rs index 51208906c2f..7473c890c5a 100644 --- a/src/librustc_expand/expand.rs +++ b/src/librustc_expand/expand.rs @@ -507,9 +507,7 @@ impl<'a, 'b> MacroExpander<'a, 'b> { expanded_fragments.push(Vec::new()); } expanded_fragments[depth - 1].push((expn_id, expanded_fragment)); - if !self.cx.ecfg.single_step { - invocations.extend(new_invocations.into_iter().rev()); - } + invocations.extend(new_invocations.into_iter().rev()); } self.cx.current_expansion = orig_expansion_data; @@ -1819,7 +1817,6 @@ pub struct ExpansionConfig<'feat> { pub recursion_limit: usize, pub trace_mac: bool, pub should_test: bool, // If false, strip `#[test]` nodes - pub single_step: bool, pub keep_macs: bool, } @@ -1831,7 +1828,6 @@ impl<'feat> ExpansionConfig<'feat> { recursion_limit: 1024, trace_mac: false, should_test: false, - single_step: false, keep_macs: false, } } |
