collect_tokens_trailing_token cleanups by nnethercote · Pull Request #127902 · rust-lang/rust (original) (raw)

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 andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Conversation10 Commits5 Checks6 Files changed

Conversation

This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters

[ Show hidden characters]({{ revealButtonHref }})

nnethercote

More cleanups I made while understanding the code for processing cfg_attr, to fix test failures in #124141.

r? @petrochenkov

@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

Jul 18, 2024

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@petrochenkov

r=me after updating the doc example to not fail.
@rustbot author

@rustbot rustbot added S-waiting-on-author

Status: This is awaiting some action (such as code changes or more information) from the author.

and removed S-waiting-on-review

Status: Awaiting review from the assignee but also interested parties.

labels

Jul 18, 2024

@bors

@nnethercote

I fixed the doc failure and rebased.

@bors r=petrochenkov

@bors

📌 Commit 4b20da7 has been approved by petrochenkov

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-author

Status: This is awaiting some action (such as code changes or more information) from the author.

labels

Jul 18, 2024

@nnethercote

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request

Jul 19, 2024

@matthiaskrgr

…g_token-cleanups, r=petrochenkov

collect_tokens_trailing_token cleanups

More cleanups I made while understanding the code for processing cfg_attr, to fix test failures in rust-lang#124141.

r? @petrochenkov

@tgross35

@bors bors added S-waiting-on-author

Status: This is awaiting some action (such as code changes or more information) from the author.

and removed S-waiting-on-bors

Status: Waiting on bors to run and complete tests. Bors will change the label on completion.

labels

Jul 19, 2024

@nnethercote

The Options within the ReplaceRanges within the hashmap are always None. This PR omits them and inserts them when they are extracted from the hashmap.

@nnethercote

It's no shorter than ret.attrs(), and ret.attrs() is used multiple times earlier in the function.

@nnethercote

This puts it just before the replace_ranges initialization, which makes sense because the two variables are closely related.

@nnethercote

Currently in collect_tokens_trailing_token, start_pos and end_pos are 1-indexed by replace_ranges is 0-indexed, which is really confusing. Making them both 0-indexed makes debugging much easier.

@nnethercote

Adding details, clarifying lots of little things, etc. In particular, the commit adds details of an example. I find this very helpful, because it's taken me a long time to understand how this code works.

@nnethercote

I added a reason to the ignore comment, hopefully that should fix the problem.

@bors r=petrochenkov

@bors

📌 Commit 1dd566a has been approved by petrochenkov

It is now in the queue for this repository.

@bors bors removed the S-waiting-on-author

Status: This is awaiting some action (such as code changes or more information) from the author.

label

Jul 19, 2024

@bors bors added the S-waiting-on-bors

Status: Waiting on bors to run and complete tests. Bors will change the label on completion.

label

Jul 19, 2024

bors added a commit to rust-lang-ci/rust that referenced this pull request

Jul 19, 2024

@bors

Rollup of 7 pull requests

Successful merges:

r? @ghost @rustbot modify labels: rollup

rust-timer added a commit to rust-lang-ci/rust that referenced this pull request

Jul 19, 2024

@rust-timer

Rollup merge of rust-lang#127902 - nnethercote:collect_tokens_trailing_token-cleanups, r=petrochenkov

collect_tokens_trailing_token cleanups

More cleanups I made while understanding the code for processing cfg_attr, to fix test failures in rust-lang#124141.

r? @petrochenkov

@nnethercote nnethercote deleted the collect_tokens_trailing_token-cleanups branch

July 21, 2024 23:48

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.