Skip to content

Remove the lifetime from ExpTokenPair/SeqSep. #145830

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

Merged
merged 1 commit into from
Aug 25, 2025

Conversation

nnethercote
Copy link
Contributor

@nnethercote nnethercote commented Aug 24, 2025

TokenKind now impls Copy, so we can store it directly rather than a reference.

r? @chenyukang

`TokenKind` now impls `Copy`, so we can store it directly rather than a
reference.
@rustbot rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Aug 24, 2025
@nnethercote
Copy link
Contributor Author

@bors2 try @rust-timer queue

@rust-timer

This comment has been minimized.

rust-bors bot added a commit that referenced this pull request Aug 24, 2025
Remove the lifetime from `ExpTokenPair`/`SeqSep`.
@rust-bors

This comment has been minimized.

@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Aug 24, 2025
@rust-bors
Copy link

rust-bors bot commented Aug 25, 2025

☀️ Try build successful (CI)
Build commit: b96152e (b96152e556104b0ec2209f6df0f3896646034a54, parent: 809200ec956983fce4ae178b87dada69f01d0820)

@rust-timer

This comment has been minimized.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (b96152e): comparison URL.

Overall result: no relevant changes - no action needed

Benchmarking this pull request means it may be perf-sensitive – we'll automatically label it not fit for rolling up. You can override this, but we strongly advise not to, due to possible changes in compiler perf.

@bors rollup=never
@rustbot label: -S-waiting-on-perf -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results (secondary 2.6%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
2.6% [2.1%, 2.8%] 3
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Cycles

Results (primary -2.2%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-2.2% [-2.2%, -2.2%] 1
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -2.2% [-2.2%, -2.2%] 1

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 469.654s -> 466.377s (-0.70%)
Artifact size: 378.39 MiB -> 378.40 MiB (0.00%)

@rustbot rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Aug 25, 2025
@nnethercote
Copy link
Contributor Author

No perf impact, which is what I expected, but this code is hot so that's why I checked.

@bors rollup

@nnethercote nnethercote marked this pull request as ready for review August 25, 2025 04:57
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 25, 2025
@chenyukang
Copy link
Member

@bors r=chenyukang

@bors
Copy link
Collaborator

bors commented Aug 25, 2025

📌 Commit a06c388 has been approved by chenyukang

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 Aug 25, 2025
bors added a commit that referenced this pull request Aug 25, 2025
Rollup of 10 pull requests

Successful merges:

 - #135761 (Dial down detail of B-tree description)
 - #145620 (Account for impossible bounds making seemingly unsatisfyable dyn-to-dyn casts)
 - #145788 (Fix attribute target checking for macro calls)
 - #145794 (bootstrap.py: Improve CPU detection on NetBSD)
 - #145817 (cg_llvm: Replace the `llvm::Bool` typedef with a proper newtype)
 - #145820 (raw-dylib-elf: set correct `DT_VERDEFNUM`)
 - #145828 (Update `bitflags` to 2.9.3.)
 - #145830 (Remove the lifetime from `ExpTokenPair`/`SeqSep`.)
 - #145836 (Remove outdated bug comments)
 - #145842 (rustc-dev-guide subtree update)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 078bfaa into rust-lang:master Aug 25, 2025
11 checks passed
@rustbot rustbot added this to the 1.91.0 milestone Aug 25, 2025
rust-timer added a commit that referenced this pull request Aug 25, 2025
Rollup merge of #145830 - nnethercote:TokenKind-unref, r=chenyukang

Remove the lifetime from `ExpTokenPair`/`SeqSep`.

`TokenKind` now impls `Copy`, so we can store it directly rather than a reference.

r? `@chenyukang`
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