Skip to content

Rollup of 2 pull requests #150430

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.

Sign up for GitHub

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

Jump to bottom
Merged
bors merged 4 commits into from
Dec 27, 2025
Merged

Rollup of 2 pull requests #150430

bors merged 4 commits into from
Dec 27, 2025

Conversation

@JonathanBrouwer
Copy link
Contributor

@JonathanBrouwer JonathanBrouwer commented Dec 27, 2025 •
edited by rustbot
Loading

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Urgau and others added 4 commits December 26, 2025 16:38
@Urgau
Document relative and absolute paths handling in --remap-path-prefix
90e80f5
@estebank
Don't use matches! when == suffices
9f566f2 
In the codebase we sometimes use `matches!` for values that can actually just be compared. Replace them with `==`.
@JonathanBrouwer
Rollup merge of rust-lang#150393 - Urgau:remap-path-relative-doc, r=j…
b1fd0b3 
…ieyouxu

Document relative and absolute paths handling in `--remap-path-prefix`

After what we have been through with rust-lang#150110 and rust-lang#150283 in the compiler, I think it would be good to document the user-facing parts of the relative and absolute paths handling in `--remap-path-prefix`.

r? `@jieyouxu`
@JonathanBrouwer
Rollup merge of rust-lang#150405 - estebank:matches-could-be-equals, …
d63068b 
…r=Kivooeo

Don't use `matches!` when `==` suffices

In the codebase we sometimes use `matches!` for values that can actually just be compared. Replace them with `==`.

Subset of rust-lang#149933.
@rustbot rustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) 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. rollup A PR which is a rollup labels Dec 27, 2025
@JonathanBrouwer
Copy link
Contributor Author

JonathanBrouwer commented Dec 27, 2025

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Dec 27, 2025

📌 Commit d63068b has been approved by JonathanBrouwer

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 Dec 27, 2025
@bors
Copy link
Collaborator

bors commented Dec 27, 2025

⌛ Testing commit d63068b with merge 4c67064...

@bors
Copy link
Collaborator

bors commented Dec 27, 2025

☀️ Test successful - checks-actions
Approved by: JonathanBrouwer
Pushing 4c67064 to main...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 27, 2025
@bors bors merged commit 4c67064 into rust-lang:main Dec 27, 2025
12 checks passed
@rustbot rustbot added this to the 1.94.0 milestone Dec 27, 2025
@rust-timer
Copy link
Collaborator

rust-timer commented Dec 27, 2025

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#150393 Document relative and absolute paths handling in `--remap-p… 8893d6b5ad5af94ae0dae9a40737baf62f28e3c5 (link)
#150405 Don't use matches! when == suffices f4cac24c1e89d980600f2cf97abd2867fd9a15b7 (link)

previous master: 0850949213

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
Contributor

github-actions bot commented Dec 27, 2025

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 0850949 (parent) -> 4c67064 (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 4c6706452cd0190d5435ad33dc25e565b6457517 --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-rust-for-linux: 2651.7s -> 3135.0s (+18.2%)
  2. dist-apple-various: 3571.3s -> 4210.8s (+17.9%)
  3. pr-check-1: 1752.1s -> 2049.7s (+17.0%)
  4. x86_64-gnu-debug: 6500.0s -> 7544.4s (+16.1%)
  5. aarch64-apple: 9513.2s -> 11028.1s (+15.9%)
  6. pr-check-2: 2296.1s -> 2633.3s (+14.7%)
  7. x86_64-gnu-llvm-21-1: 3965.8s -> 4541.0s (+14.5%)
  8. arm-android: 5838.5s -> 6647.7s (+13.9%)
  9. x86_64-gnu: 7543.4s -> 8572.1s (+13.6%)
  10. i686-gnu-2: 5308.8s -> 6027.9s (+13.5%)
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
Collaborator

rust-timer commented Dec 27, 2025

Finished benchmarking commit (4c67064): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

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

Max RSS (memory usage)

Results (secondary 2.9%)

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.9% [1.6%, 4.2%] 2
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) - - 0

Cycles

Results (secondary -3.5%)

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)		 -3.5% [-4.5%, -2.4%] 2
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 482.408s -> 484.312s (0.39%)
Artifact size: 390.78 MiB -> 390.81 MiB (0.01%)

@bors bors mentioned this pull request Dec 27, 2025
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

A-attributes Area: Attributes (`#[…]`, `#![…]`) merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup 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

Milestone

1.94.0

Development

Successfully merging this pull request may close these issues.

6 participants

@JonathanBrouwer @bors @rust-timer @rustbot @Urgau @estebank