bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Remove Iterator impl for TokenTreeCursor.

Browse source 
This is surprising, but the new comment explains why. It's a logical
conclusion in the drive to avoid `TokenTree` clones.

`TokenTreeCursor` is now only used within `Parser`. It's still needed
due to `replace_prev_and_rewind`.
This commit is contained in:
Nicholas Nethercote 2023-07-27 11:48:55 +10:00
parent ee6ed60373
commit 4ebf2be8bb
3 changed files with 13 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_expand/src/proc_macro_server.rs
View file

@ -94,10 +94,10 @@ impl FromInternal<(TokenStream, &mut Rustc<'_, '_>)> for Vec<TokenTree<TokenStre
// Estimate the capacity as `stream.len()` rounded up to the next power
// of two to limit the number of required reallocations.
let mut trees = Vec::with_capacity(stream.len().next_power_of_two());
let mut cursor = stream.into_trees();
let mut cursor = stream.trees();
while let Some(tree) = cursor.next() {
let (Token { kind, span }, joint) = match tree {
let (Token { kind, span }, joint) = match tree.clone() {
tokenstream::TokenTree::Delimited(span, delim, tts) => {
let delimiter = pm::Delimiter::from_internal(delim);
trees.push(TokenTree::Group(Group {