bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Move things around in collect_tokens_trailing_token.

Browse source 
So that the `capturing` state is adjusted immediately before and after
the call to `f`.
This commit is contained in:
Nicholas Nethercote 2024-07-01 16:12:22 +10:00
parent 2342770f49
commit 8b5a7eb7f4
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
compiler/rustc_parse/src/parser/attr_wrapper.rs
View file

@ -218,16 +218,16 @@ impl<'a> Parser<'a> {
let start_token = (self.token.clone(), self.token_spacing); let start_token = (self.token.clone(), self.token_spacing);
let cursor_snapshot = self.token_cursor.clone(); let cursor_snapshot = self.token_cursor.clone();
let start_pos = self.num_bump_calls; let start_pos = self.num_bump_calls;
let has_outer_attrs = !attrs.attrs.is_empty(); let has_outer_attrs = !attrs.attrs.is_empty();
let prev_capturing = std::mem::replace(&mut self.capture_state.capturing, Capturing::Yes);
let replace_ranges_start = self.capture_state.replace_ranges.len(); let replace_ranges_start = self.capture_state.replace_ranges.len();
let ret = f(self, attrs.attrs); let (mut ret, trailing) = {
let prev_capturing =
std::mem::replace(&mut self.capture_state.capturing, Capturing::Yes);
let ret_and_trailing = f(self, attrs.attrs);
self.capture_state.capturing = prev_capturing; self.capture_state.capturing = prev_capturing;
ret_and_trailing?
let (mut ret, trailing) = ret?; };
// When we're not in `capture-cfg` mode, then bail out early if: // When we're not in `capture-cfg` mode, then bail out early if:
// 1. Our target doesn't support tokens at all (e.g we're parsing an `NtIdent`) // 1. Our target doesn't support tokens at all (e.g we're parsing an `NtIdent`)