bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Inline and remove parse_token_tree_non_delim_non_eof.

Browse source 
It has a single call site.
This commit is contained in:
Nicholas Nethercote 2022-09-30 16:50:02 +10:00
parent ce7676829e
commit 8d0754d602
1 changed files with 14 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

30
compiler/rustc_parse/src/lexer/tokentrees.rs
View file

@ -64,7 +64,20 @@ impl<'a> TokenTreesReader<'a> {
} }
return Ok(buf.into_token_stream()); return Ok(buf.into_token_stream());
} }
_ => buf.push(self.parse_token_tree_non_delim_non_eof()), _ => {
// `this_spacing` for the returned token refers to whether the token is
// immediately followed by another op token. It is determined by the
// next token: its kind and its `preceded_by_whitespace` status.
let (next_tok, is_next_tok_preceded_by_whitespace) =
self.string_reader.next_token();
let this_spacing = if is_next_tok_preceded_by_whitespace || !next_tok.is_op() {
Spacing::Alone
} else {
Spacing::Joint
};
let this_tok = std::mem::replace(&mut self.token, next_tok);
buf.push(TokenTree::Token(this_tok, this_spacing))
}
} }
} }
} }
@ -235,21 +248,6 @@ impl<'a> TokenTreesReader<'a> {
err.span_label(self.token.span, "unexpected closing delimiter"); err.span_label(self.token.span, "unexpected closing delimiter");
err err
} }
#[inline]
fn parse_token_tree_non_delim_non_eof(&mut self) -> TokenTree {
// `this_spacing` for the returned token refers to whether the token is
// immediately followed by another op token. It is determined by the
// next token: its kind and its `preceded_by_whitespace` status.
let (next_tok, is_next_tok_preceded_by_whitespace) = self.string_reader.next_token();
let this_spacing = if is_next_tok_preceded_by_whitespace || !next_tok.is_op() {
Spacing::Alone
} else {
Spacing::Joint
};
let this_tok = std::mem::replace(&mut self.token, next_tok);
TokenTree::Token(this_tok, this_spacing)
}
} }
#[derive(Default)] #[derive(Default)]