Skip to content

Conversation

@Zalathar
Copy link
Member

@Zalathar Zalathar commented Dec 8, 2025

Successful merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Wilfred and others added 18 commits November 16, 2025 00:33
`mod` is a keyword in Rust, and since we're talking about remainders
we should be using division syntax here.
While some of this information is needed by debugger discovery, it is also
needed by non-debuginfo tests, so the code doesn't belong in the `debuggers`
module.
Lowering for contract delcarations incorrectly handled the final
declaration statement when it didn't end in a semicolon. This
change fixes the issue.
There is no need for every contracts test to assert the same warning
for using the `contracts` feature flag, as such use
`#![expect(incomplete_features)]` in the tests, and add one test
to specifically check for the warning.
Merged tests/ui/typeck/non-function-call-error-2 with
tests/ui/typeck/non-function-call-error

Add comment to
tests/ui/traits/normalize-associated-type-in-where-clause.rs

Merged tests/ui/privacy/private-item-simple-2.rs with
tests/ui/privacy/private-item-simple.rs

Merged tests/ui/str/str-add-operator-2.rs with
tests/ui/str/str-add-operator.rs

Add comment to tests/ui/imports/duplicate-empty-imports.rs

Add comment to tests/ui/for-loop-while/nested-loop-break-unit.rs

Add comment to tests/ui/match/match-ref-option-pattern.rs

Add comment to tests/ui/closures/simple-capture-and-call.rs

Add comment to tests/ui/type/never-type-inference-fail.rs

Add comment to tests/ui/match/match-stack-overflow-72933.rs
…-Simulacrum

Fix division syntax in doc comments

`mod` is a keyword in Rust, and since we're talking about remainders we should be using division syntax here.
…ts, r=Mark-Simulacrum

Add `ilog10` result range hints

This PR adds hints that the return value of `T::ilog10` will never exceed `T::MAX.ilog10()`.

This works because `ilog10` is a monotonically nondecreasing function, the maximum return value is reached at the max input value.
Tidying up tests/ui/issues tests [3/N]

> [!NOTE]
> Intermediate commits are intended to help review, but will be squashed add comment commit prior to merge.

part of rust-lang#133895

r? Kivooeo
Move ambient gdb discovery from compiletest to bootstrap

- Follow-up to rust-lang#148099

---

This code takes the compiletest code for discovering an “ambient” `gdb` in the user's path, and moves it to bootstrap.

One of the eventual goals is to allow compiletest to assume that if it has been asked to run the debuginfo-gdb suite, then it *must* have been passed an explicit `--gdb`, though we aren't quite there yet.

r? jieyouxu
Check associated type where-clauses for lifetimes

resolves: rust-lang#148627
resolves: rust-lang#149233
…mpound-statements, r=jieyouxu

contracts: fix lowering final declaration without trailing semicolon

Lowering for contract delcarations introduced in rust-lang#144444 incorrectly handled the final declaration statement when it didn't end in a semicolon. This change fixes the issue.

See the included regression test for the minimal reproducible example.

Contracts tracking issue: rust-lang#128044
…warning-in-tests, r=Kivooeo,jieyouxu

contracts: clean up feature flag warning duplicated across tests

There is no need for every contracts test to assert the same warning for using the `contracts` feature flag, as such use `#![expect(incomplete_features)]` in the tests, and add one test to specifically check for the warning.

Making this change has been discussed in the comments of rust-lang#149722.

Contracts tracking issue: rust-lang#128044

r? Kivooeo
@rustbot rustbot added A-compiletest Area: The compiletest test runner A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-testsuite Area: The testsuite used to check the correctness of rustc A-tidy Area: The tidy tool S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) 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. rollup A PR which is a rollup labels Dec 8, 2025
@Zalathar
Copy link
Member Author

Zalathar commented Dec 8, 2025

Rollup of everything.

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Dec 8, 2025

📌 Commit 2aa4bdc has been approved by Zalathar

It is now in the queue for this repository.

@bors bors removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 8, 2025
@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 Dec 8, 2025
@bors
Copy link
Collaborator

bors commented Dec 8, 2025

⌛ Testing commit 2aa4bdc with merge 03d7ad7...

@bors
Copy link
Collaborator

bors commented Dec 8, 2025

☀️ Test successful - checks-actions
Approved by: Zalathar
Pushing 03d7ad7 to main...

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

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#148935 Fix division syntax in doc comments 76063e94b871e0a91b6475350d50849d1778ab6e (link)
#149207 Add ilog10 result range hints 63316716c101cc1d6bf7401a01cdf6d8c4aaa43a (link)
#149676 Tidying up tests/ui/issues tests [3/N] 93f2db74921d9ff12482655191a3313dba4535e7 (link)
#149710 Move ambient gdb discovery from compiletest to bootstrap c2b1209ac23f33650b263fe0ab1cd6cf1d5014d3 (link)
#149714 Check associated type where-clauses for lifetimes fcb6b1e2a19c0ad90ac9edc5cdbd81eb814f7afb (link)
#149722 contracts: fix lowering final declaration without trailing … 89053378af25ac42c3b6ee3b38962bb4a8d79ca0 (link)
#149736 contracts: clean up feature flag warning duplicated across … 39b40ad3d64afc28aec0dd0bcf4f6de07d3debc9 (link)
#149739 mailmap: add binarycat cfe65f708b4c8e119b9dab1357c16656f019464f (link)

previous master: 554952348a

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

@Zalathar Zalathar deleted the rollup-9qjiz5r branch December 8, 2025 09:42
@github-actions
Copy link
Contributor

github-actions bot commented Dec 8, 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 5549523 (parent) -> 03d7ad7 (this PR)

Test differences

Show 1488 test diffs

Stage 1

  • [ui] tests/ui/associated-types/associated-type-where-non-lifetime-const.rs: [missing] -> pass (J1)
  • [ui] tests/ui/associated-types/associated-type-where-non-lifetime-type.rs: [missing] -> pass (J1)
  • [ui] tests/ui/closures/simple-capture-and-call.rs: [missing] -> pass (J1)
  • [ui] tests/ui/contracts/incomplete-feature.rs: [missing] -> pass (J1)
  • [ui] tests/ui/contracts/requires-block-stmt.rs: [missing] -> pass (J1)
  • [ui] tests/ui/for-loop-while/nested-loop-break-unit.rs: [missing] -> pass (J1)
  • [ui] tests/ui/imports/duplicate-empty-imports.rs: [missing] -> pass (J1)
  • [ui] tests/ui/issues/issue-2151.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-22468.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-2642.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-3429.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-3500.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-3993.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-47377.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-47380.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-47673.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-51044.rs: pass -> [missing] (J1)
  • [ui] tests/ui/issues/issue-72933-match-stack-overflow.rs: pass -> [missing] (J1)
  • [ui] tests/ui/match/match-ref-option-pattern.rs: [missing] -> pass (J1)
  • [ui] tests/ui/match/match-stack-overflow-72933-.rs: [missing] -> pass (J1)
  • [ui] tests/ui/str/str-add-operator.rs: [missing] -> pass (J1)
  • [ui] tests/ui/traits/normalize-associated-type-in-where-clause.rs: [missing] -> pass (J1)
  • [ui] tests/ui/type/never-type-inference-fail.rs: [missing] -> pass (J1)
  • [ui] tests/ui/typeck/issue-10969.rs: pass -> [missing] (J1)
  • [ui] tests/ui/typeck/non-function-call-error.rs: [missing] -> pass (J1)
  • [codegen] tests/codegen-llvm/lib-optimizations/ilog10-range.rs: [missing] -> pass (J3)

Stage 2

  • [ui] tests/ui/associated-types/associated-type-where-non-lifetime-const.rs: [missing] -> pass (J0)
  • [ui] tests/ui/associated-types/associated-type-where-non-lifetime-type.rs: [missing] -> pass (J0)
  • [ui] tests/ui/closures/simple-capture-and-call.rs: [missing] -> pass (J0)
  • [ui] tests/ui/contracts/incomplete-feature.rs: [missing] -> pass (J0)
  • [ui] tests/ui/contracts/requires-block-stmt.rs: [missing] -> pass (J0)
  • [ui] tests/ui/for-loop-while/nested-loop-break-unit.rs: [missing] -> pass (J0)
  • [ui] tests/ui/imports/duplicate-empty-imports.rs: [missing] -> pass (J0)
  • [ui] tests/ui/issues/issue-2151.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-22468.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-2642.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-3429.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-3500.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-3993.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-47377.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-47380.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-47673.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-51044.rs: pass -> [missing] (J0)
  • [ui] tests/ui/issues/issue-72933-match-stack-overflow.rs: pass -> [missing] (J0)
  • [ui] tests/ui/match/match-ref-option-pattern.rs: [missing] -> pass (J0)
  • [ui] tests/ui/match/match-stack-overflow-72933-.rs: [missing] -> pass (J0)
  • [ui] tests/ui/str/str-add-operator.rs: [missing] -> pass (J0)
  • [ui] tests/ui/traits/normalize-associated-type-in-where-clause.rs: [missing] -> pass (J0)
  • [ui] tests/ui/type/never-type-inference-fail.rs: [missing] -> pass (J0)
  • [ui] tests/ui/typeck/issue-10969.rs: pass -> [missing] (J0)
  • [ui] tests/ui/typeck/non-function-call-error.rs: [missing] -> pass (J0)
  • [codegen] tests/codegen-llvm/lib-optimizations/ilog10-range.rs: [missing] -> pass (J2)

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

Job group index

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard 03d7ad7dd67d71f1ef1a790fcb4ceb2484ced761 --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. dist-aarch64-apple: 7240.4s -> 8424.6s (+16.4%)
  2. x86_64-rust-for-linux: 3170.5s -> 2826.0s (-10.9%)
  3. x86_64-gnu-llvm-20: 2758.2s -> 2461.1s (-10.8%)
  4. i686-gnu-2: 6139.3s -> 5505.4s (-10.3%)
  5. armhf-gnu: 5486.0s -> 4919.9s (-10.3%)
  6. x86_64-msvc-ext1: 7211.7s -> 7934.8s (+10.0%)
  7. x86_64-gnu-gcc: 3427.6s -> 3090.0s (-9.9%)
  8. x86_64-msvc-ext3: 6383.7s -> 5758.6s (-9.8%)
  9. x86_64-gnu-llvm-21-1: 3442.3s -> 3115.3s (-9.5%)
  10. aarch64-msvc-2: 5352.5s -> 4845.3s (-9.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

Finished benchmarking commit (03d7ad7): 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)

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

Cycles

Results (primary -1.1%, secondary -3.2%)

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

mean range count
Regressions ❌
(primary)
2.1% [2.1%, 2.1%] 1
Regressions ❌
(secondary)
1.2% [1.2%, 1.2%] 1
Improvements ✅
(primary)
-2.7% [-3.6%, -1.8%] 2
Improvements ✅
(secondary)
-7.5% [-7.5%, -7.5%] 1
All ❌✅ (primary) -1.1% [-3.6%, 2.1%] 3

Binary size

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

Bootstrap: 471.938s -> 472.922s (0.21%)
Artifact size: 388.98 MiB -> 389.01 MiB (0.01%)

@Kobzol
Copy link
Member

Kobzol commented Dec 8, 2025

@rust-timer build 6331671

Doing a perf.run just to test two collectors in rustc-perf.

@rust-timer

This comment has been minimized.

@rust-timer

This comment was marked as outdated.

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

Labels

A-compiletest Area: The compiletest test runner A-meta Area: Issues & PRs about the rust-lang/rust repository itself A-testsuite Area: The testsuite used to check the correctness of rustc A-tidy Area: The tidy tool 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-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) 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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

10 participants