bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Use iterator normally in make_attr_token_stream.

Browse source 
In a `for` loop, instead of a `while` loop.
This commit is contained in:
Nicholas Nethercote 2024-07-08 17:41:05 +10:00
parent a47ae57a18
commit b16201317e
1 changed files with 2 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -367,7 +367,7 @@ impl<'a> Parser<'a> {
/// `AttrTokenStream`, creating an `AttrTokenTree::Delimited` for each matching pair of open and /// `AttrTokenStream`, creating an `AttrTokenTree::Delimited` for each matching pair of open and
/// close delims. /// close delims.
fn make_attr_token_stream( fn make_attr_token_stream(
mut iter: impl Iterator<Item = (FlatToken, Spacing)>, iter: impl Iterator<Item = (FlatToken, Spacing)>,
break_last_token: bool, break_last_token: bool,
) -> AttrTokenStream { ) -> AttrTokenStream {
#[derive(Debug)] #[derive(Debug)]
@ -377,8 +377,7 @@ fn make_attr_token_stream(
inner: Vec<AttrTokenTree>, inner: Vec<AttrTokenTree>,
} }
let mut stack = vec![FrameData { open_delim_sp: None, inner: vec![] }]; let mut stack = vec![FrameData { open_delim_sp: None, inner: vec![] }];
let mut token_and_spacing = iter.next(); for (token, spacing) in iter {
while let Some((token, spacing)) = token_and_spacing {
match token { match token {
FlatToken::Token(Token { kind: TokenKind::OpenDelim(delim), span }) => { FlatToken::Token(Token { kind: TokenKind::OpenDelim(delim), span }) => {
stack stack
@ -416,7 +415,6 @@ fn make_attr_token_stream(
.push(AttrTokenTree::AttrsTarget(target)), .push(AttrTokenTree::AttrsTarget(target)),
FlatToken::Empty => {} FlatToken::Empty => {}
} }
token_and_spacing = iter.next();
} }
let mut final_buf = stack.pop().expect("Missing final buf!"); let mut final_buf = stack.pop().expect("Missing final buf!");
if break_last_token { if break_last_token {