Skip to content

Rollup of 2 pull requests#158529

Merged
rust-bors[bot] merged 6 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-rnUjpna
Jun 28, 2026
Merged

Rollup of 2 pull requests#158529
rust-bors[bot] merged 6 commits into
rust-lang:mainfrom
JonathanBrouwer:rollup-rnUjpna

Conversation

@JonathanBrouwer

Copy link
Copy Markdown
Contributor

Successful merges:

r? @ghost

Create a similar rollup

ijchen and others added 6 commits September 16, 2025 16:52
…5, r=Mark-Simulacrum

Update itertools to 0.15

This bumps the itertools dependency to [0.15](https://github.com/rust-itertools/itertools/blob/master/CHANGELOG.md#0150).

There’s a breaking change upstream in the shape of `itertools::Position`, so this updates the use sites of it as well, aside from submodules like clippy, which will be handled [separately](rust-lang/rust-clippy#16805).
…rk-Simulacrum

Change `Location<'_>` lifetime to `'static` in `Panic[Hook]Info`

I'm writing a library that would benefit from being able to store a `&'static str` instead of a `String` for the file location of a panic. Currently, the API of [`std::panic::PanicHookInfo::location`](https://doc.rust-lang.org/nightly/std/panic/struct.PanicHookInfo.html#method.location) and [`core::panic::PanicInfo::location`](https://doc.rust-lang.org/nightly/core/panic/struct.PanicInfo.html#method.location) return a `Location<'_>` (and by extension, a file name `&str`) whose lifetime is tied to the borrow of the `Panic[Hook]Info`.

It is my understanding that the `Location`/`&str` will always be `Location<'static>`/`&'static str`, since the file name is embedded directly into the compiled binary (and I don't see a likely reason/way for that to ever change in the future). Since it seems unlikely to ever need to change, and since making the guarantee that the returned lifetime is `'static` has a real benefit (allows users to avoid unnecessary allocations), I think changing to the returned `Location<'_>`'s lifetime to `'static` would be a worthwhile change.

see also the recent [#1320870](rust-lang#132087), which made a similar change to [`std::panic::Location`](https://doc.rust-lang.org/nightly/std/panic/struct.Location.html)
@rust-bors rust-bors Bot added the rollup A PR which is a rollup label Jun 28, 2026
@rustbot rustbot added A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. 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. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output. labels Jun 28, 2026
@JonathanBrouwer

Copy link
Copy Markdown
Contributor Author

@bors r+ rollup=never p=5

@rust-bors

rust-bors Bot commented Jun 28, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 6b1bbf9 has been approved by JonathanBrouwer

It is now in the queue for this repository.

@rust-bors rust-bors Bot 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 Jun 28, 2026
@rust-bors

This comment has been minimized.

rust-bors Bot pushed a commit that referenced this pull request Jun 28, 2026
…uwer

Rollup of 2 pull requests

Successful merges:

 - #156419 (Update itertools to 0.15)
 - #146561 (Change `Location<'_>` lifetime to `'static` in `Panic[Hook]Info`)
@rust-bors rust-bors Bot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 28, 2026
@rust-bors

rust-bors Bot commented Jun 28, 2026

Copy link
Copy Markdown
Contributor

💔 Test for 4cda55b failed: CI. Failed job:

@JonathanBrouwer

Copy link
Copy Markdown
Contributor Author

@bors retry
@bors treeclosed=1

@rust-bors rust-bors Bot 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 Jun 28, 2026
@rust-bors

rust-bors Bot commented Jun 28, 2026

Copy link
Copy Markdown
Contributor

Tree closed for PRs with priority less than 1.

@rust-bors

This comment has been minimized.

@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

A job failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)
  IMAGE: dist-x86_64-musl
##[endgroup]
    Updating crates.io index
error: failed to get `adler2` as a dependency of package `miniz_oxide v0.8.8`
    ... which satisfies dependency `miniz_oxide = "^0.8.5"` of package `flate2 v1.1.9`
    ... which satisfies dependency `flate2 = "^1.1.9"` of package `citool v0.1.0 (/home/runner/work/rust/rust/src/ci/citool)`

Caused by:
  failed to load source for dependency `adler2`

Caused by:
  unable to update registry `crates-io`

Caused by:
  download of ad/le/adler2 failed

Caused by:
  curl failed

Caused by:

@JonathanBrouwer

This comment has been minimized.

@rust-bors

This comment has been minimized.

@rust-bors

rust-bors Bot commented Jun 28, 2026

Copy link
Copy Markdown
Contributor

☀️ Test successful - CI
Approved by: JonathanBrouwer
Duration: 3h 9m 26s
Pushing df6ee90 to main...

@rust-bors rust-bors Bot removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jun 28, 2026
@rust-bors rust-bors Bot merged commit df6ee90 into rust-lang:main Jun 28, 2026
14 checks passed
@rustbot rustbot added this to the 1.98.0 milestone Jun 28, 2026
@rust-timer

Copy link
Copy Markdown
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#146561 Change Location<'_> lifetime to 'static in `Panic[Hook]… 6052d41dd2922214470d2e6c64c108372ba90023 (link)
#156419 Update itertools to 0.15 8cf224568db6bb16eaf9cd66d1a1993ccb7cb7bd (link)

previous master: 2574810b22

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

@github-actions

Copy link
Copy Markdown
Contributor
What is this? This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing 2574810 (parent) -> df6ee90 (this PR)

Test differences

Show 2 test diffs

2 doctest diffs were found. These are ignored, as they are noisy.

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard df6ee909ef35c75aa58aa45af6ac071a9b8285c2 --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

  1. x86_64-gnu-gcc-core-tests: 7m 30s -> 13m 47s (+83.8%)
  2. dist-apple-various: 1h 47m -> 1h 19m (-26.6%)
  3. dist-ohos-armv7: 58m 13s -> 1h 12m (+24.9%)
  4. dist-arm-linux-gnueabi: 1h 12m -> 1h 29m (+23.1%)
  5. dist-x86_64-msvc-alt: 2h 40m -> 2h 4m (-22.4%)
  6. dist-i586-gnu-i586-i686-musl: 1h 34m -> 1h 15m (-20.4%)
  7. dist-i686-msvc: 1h 55m -> 1h 32m (-20.1%)
  8. x86_64-gnu-gcc: 1h -> 1h 9m (+15.6%)
  9. aarch64-apple: 3h 10m -> 2h 41m (-15.2%)
  10. x86_64-gnu-next-trait-solver-polonius: 51m 58s -> 59m 22s (+14.2%)
How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

@rust-timer

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (df6ee90): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This perf run didn't have relevant results for this metric.

Max RSS (memory usage)

Results (secondary 0.1%)

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)
5.9% [5.0%, 6.8%] 2
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-3.8% [-6.7%, -2.2%] 3
All ❌✅ (primary) - - 0

Cycles

Results (secondary -7.3%)

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)
- - 0
Improvements ✅
(secondary)
-7.3% [-9.6%, -4.9%] 2
All ❌✅ (primary) - - 0

Binary size

This perf run didn't have relevant results for this metric.

Bootstrap: 485.934s -> 485.504s (-0.09%)
Artifact size: 395.62 MiB -> 393.08 MiB (-0.64%)

@jhpratt

jhpratt commented Jun 29, 2026

Copy link
Copy Markdown
Member

@bors treeclosed-

@rust-bors

rust-bors Bot commented Jun 29, 2026

Copy link
Copy Markdown
Contributor

Tree is now open for merging.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants