Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use by ref TokenTree iterator to avoid a few clones #111492

Merged
merged 1 commit into from
May 12, 2023

Conversation

calebcartwright
Copy link
Member

Just a handful of swaps from the by-value cursor to by-ref cursor so as to avoid some unnecessary clones.

I've been doing some analysis on internal cleanup opportunities within rustfmt and as part of that yak-shave I found myself perusing broader token stream and tree usage (which we use within rustfmt). As reflected in some inline comments on the cursor structs (not part of this diff), there's probably many other such cases throughout the code, but figured I'd start small with these while I had the time. May take a look at the other sites in the future

@rustbot
Copy link
Collaborator

rustbot commented May 12, 2023

r? @WaffleLapkin

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels May 12, 2023
@calebcartwright calebcartwright changed the title use by ref TokenStream iterator to avoid a few clones use by ref TokenTree iterator to avoid a few clones May 12, 2023
@compiler-errors
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented May 12, 2023

📌 Commit 05c5df5 has been approved by compiler-errors

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 12, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request May 12, 2023
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#111179 (Fix instrument-coverage tests by using Python to sort instantiation groups)
 - rust-lang#111393 (bump windows crate 0.46 -> 0.48)
 - rust-lang#111441 (Verify copies of mutable pointers in 2 stages in ReferencePropagation)
 - rust-lang#111456 (Update cargo)
 - rust-lang#111490 (Don't ICE in layout computation for placeholder types)
 - rust-lang#111492 (use by ref TokenTree iterator to avoid a few clones)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 9039de6 into rust-lang:master May 12, 2023
@rustbot rustbot added this to the 1.71.0 milestone May 12, 2023
@calebcartwright calebcartwright deleted the by-ref-tokentree-1 branch May 13, 2023 02:01
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request May 15, 2023
… r=compiler-errors

add util function to TokenStream to eliminate some clones

Another proposed change in the same vein as rust-lang#111492 trying to get rid of some clones.

This adds a TokenStream helper function so that rustdoc can directly get a chunks iterator over the underlying token trees so that it no longer needs the clones and vec.
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request May 15, 2023
… r=compiler-errors

add util function to TokenStream to eliminate some clones

Another proposed change in the same vein as rust-lang#111492 trying to get rid of some clones.

This adds a TokenStream helper function so that rustdoc can directly get a chunks iterator over the underlying token trees so that it no longer needs the clones and vec.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants