Skip to content

Commit d5aff41

Browse files
authored
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 61c7569 -- 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.
2 parents 6b8fb7c + a0d4c74 commit d5aff41

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

src/librustc_expand/expand.rs

+1-5
Original file line numberDiff line numberDiff line change
@@ -507,9 +507,7 @@ impl<'a, 'b> MacroExpander<'a, 'b> {
507507
expanded_fragments.push(Vec::new());
508508
}
509509
expanded_fragments[depth - 1].push((expn_id, expanded_fragment));
510-
if !self.cx.ecfg.single_step {
511-
invocations.extend(new_invocations.into_iter().rev());
512-
}
510+
invocations.extend(new_invocations.into_iter().rev());
513511
}
514512

515513
self.cx.current_expansion = orig_expansion_data;
@@ -1819,7 +1817,6 @@ pub struct ExpansionConfig<'feat> {
18191817
pub recursion_limit: usize,
18201818
pub trace_mac: bool,
18211819
pub should_test: bool, // If false, strip `#[test]` nodes
1822-
pub single_step: bool,
18231820
pub keep_macs: bool,
18241821
}
18251822

@@ -1831,7 +1828,6 @@ impl<'feat> ExpansionConfig<'feat> {
18311828
recursion_limit: 1024,
18321829
trace_mac: false,
18331830
should_test: false,
1834-
single_step: false,
18351831
keep_macs: false,
18361832
}
18371833
}

0 commit comments

Comments
 (0)