Skip to content

Rollup of 7 pull requests#156190

Merged
rust-bors[bot] merged 20 commits intorust-lang:mainfrom
JonathanBrouwer:rollup-db0KRf1
May 5, 2026
Merged

Rollup of 7 pull requests#156190
rust-bors[bot] merged 20 commits intorust-lang:mainfrom
JonathanBrouwer:rollup-db0KRf1

Conversation

@JonathanBrouwer
Copy link
Copy Markdown
Contributor

Successful merges:

r? @ghost

Create a similar rollup

qaijuang and others added 20 commits May 1, 2026 13:53
This reverts commit 5ad560f and adds a regression test.
resolve: Catch "cannot reexport" errors from macros 2.0 better

After the macro 2.0 related holes are closed we can report `span_delayed_bug`s in more situations.

Merging rust-lang#155945 would make changes in this PR simpler, but that PR will probably have to wait for quite some time.

This is a continuation of my import & privacy invariant hardening changes from rust-lang#155257, rust-lang#155213, rust-lang#154149, etc.

r? @mu001999
Print HRTB binders before fn qualifiers

Fixes rust-lang#151393

This PR updates the custom fn-signature diff used in type mismatch diagnostics to print higher-ranked binders before fn qualifiers.

We might want to update reference also: https://github.com/rust-lang/reference/blob/581920f9109f141b88b860b3e1e8359e3896a150/src/items/external-blocks.md?plain=1#L60
Implement a new flag `-Zdisable-fast-paths` in trait solving

Discussion: [#t-types/trait-system-refactor > ask for help @ 💬](https://rust-lang.zulipchat.com/#narrow/channel/364551-t-types.2Ftrait-system-refactor/topic/ask.20for.20help/near/583953725)

r? lcnr
…henkov

Revert "remove `MethodReceiverExpr` special-casing"

This reverts commit 5ad560f and adds a regression test.

Fixes rust-lang#156084.

r? @petrochenkov
Revert const hacks and use const closures in std

This revealed some smaller bugs in stability checking that I fixed where needed:

* const closures use the const stability of their parent
* trait method default bodies use the const stability of their trait

Otherwise trivial reverts of the const hacks that were added

fixes rust-lang#155781
Update `askama` version to `0.16.0`

New features and bugfixes. Full changelog is [here](https://github.com/askama-rs/askama/releases/tag/v0.16.0).

r? @Urgau
…r=mati865

Remove duplicate debug assert

This is this.
@rust-bors rust-bors Bot added the rollup A PR which is a rollup label May 5, 2026
@rustbot rustbot added A-CI Area: Our Github Actions CI A-testsuite Area: The testsuite used to check the correctness of rustc 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-clippy Relevant to the Clippy team. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure 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-rust-analyzer Relevant to the rust-analyzer team, which will review and decide on the PR/issue. labels May 5, 2026
@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 May 5, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented May 5, 2026

💔 Test for 17beea4 failed: CI. Failed job:

@JonathanBrouwer
Copy link
Copy Markdown
Contributor Author

@bors retry

@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 May 5, 2026
@rust-bors

This comment has been minimized.

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

Rollup of 7 pull requests

Successful merges:

 - #156014 (resolve: Catch "cannot reexport" errors from macros 2.0 better)
 - #156058 (Print HRTB binders before fn qualifiers)
 - #156172 (Implement a new flag `-Zdisable-fast-paths` in trait solving)
 - #156184 (Revert "remove `MethodReceiverExpr` special-casing")
 - #155957 (Revert const hacks and use const closures in std)
 - #156127 (Update `askama` version to `0.16.0`)
 - #156183 (Remove duplicate debug assert)
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented May 5, 2026

☀️ Try build successful (CI)
Build commit: f40579e (f40579e9c3f2a314926de68ff0e678ec421eb555, parent: 4feb7221f4d445120a5061b16ce7222adbfdf6f6)

@rust-log-analyzer
Copy link
Copy Markdown
Collaborator

The job x86_64-gnu-llvm-21-1 failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)
test expr_store::tests::body::array_element_cfg ... ok
test expr_store::scope::tests::test_shadow_variable ... ok
test expr_store::scope::tests::while_let_adds_binding ... ok
test expr_store::tests::body::async_fn_weird_param_patterns ... ok
error: test failed, to rerun pass `-p hir-def --lib`

Caused by:
  process didn't exit successfully: `/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools/x86_64-unknown-linux-gnu/release/deps/hir_def-c439368f2b64a049 '--skip=tests::smoke_test_real_sysroot_cargo' --skip=check_code_formatting -Z unstable-options --format json` (signal: 11, SIGSEGV: invalid memory reference)
Bootstrap failed while executing `--stage 2 test --skip tests --skip coverage-map --skip coverage-run --skip library --skip tidyselftest`
Build completed unsuccessfully in 1:01:02
  local time: Tue May  5 16:21:17 UTC 2026
  network time: Tue, 05 May 2026 16:21:17 GMT
##[error]Process completed with exit code 1.

@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 May 5, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented May 5, 2026

💔 Test for ef76606 failed: CI. Failed job:

@JonathanBrouwer
Copy link
Copy Markdown
Contributor Author

@bors retry

@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 May 5, 2026
@rust-bors

This comment has been minimized.

@rust-bors rust-bors Bot added the merged-by-bors This PR was explicitly merged by bors. label May 5, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors Bot commented May 5, 2026

☀️ Test successful - CI
Approved by: JonathanBrouwer
Duration: 3h 19m 50s
Pushing e95e732 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 May 5, 2026
@rust-bors rust-bors Bot merged commit e95e732 into rust-lang:main May 5, 2026
13 checks passed
@rustbot rustbot added this to the 1.97.0 milestone May 5, 2026
@rust-timer
Copy link
Copy Markdown
Collaborator

📌 Perf builds for each rolled up PR:

PR# Message Perf Build Sha
#155957 Revert const hacks and use const closures in std cbb3ca4994e4222c08351db7ad7ac580de1ed0c8 (link)
#156014 resolve: Catch "cannot reexport" errors from macros 2.0 bet… 56c6db3fd9ecccea420605750c71623c879f2f7a (link)
#156058 Print HRTB binders before fn qualifiers b627cdffd8e13ccfcb04aeee4a1fe8b040eb69ca (link)
#156127 Update askama version to 0.16.0 f7de8745fbce71f694c77a78977a8da47a64659b (link)
#156172 Implement a new flag -Zdisable-fast-paths in trait solving 6cebd3e7070b419b939598ac310e1c03a0992630 (link)
#156183 Remove duplicate debug assert e07227043929ff0a59d3196f6110e48f414b034a (link)
#156184 Revert "remove MethodReceiverExpr special-casing" f16709079faa0761dbd8ec4130662dc03b03688c (link)

previous master: 740679e1f5

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

github-actions Bot commented May 5, 2026

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 740679e (parent) -> e95e732 (this PR)

Test differences

Show 588 test diffs

Stage 1

  • [ui] tests/ui/macros/semicolon-in-exprs.rs: [missing] -> pass (J0)

Stage 2

  • [ui] tests/ui/macros/semicolon-in-exprs.rs: [missing] -> pass (J1)

Additionally, 586 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 e95e73209faf6ead2bc5c7636e45e589a751b79b --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-armhf-linux: 1h 11m -> 1h 35m (+33.5%)
  2. x86_64-msvc-2: 2h -> 2h 34m (+28.7%)
  3. dist-powerpc64le-linux-gnu: 1h 16m -> 1h 36m (+26.9%)
  4. dist-apple-various: 1h 36m -> 2h 2m (+25.8%)
  5. dist-x86_64-netbsd: 1h 10m -> 1h 27m (+23.8%)
  6. x86_64-gnu-debug: 1h 30m -> 1h 49m (+21.1%)
  7. dist-loongarch64-musl: 1h 28m -> 1h 47m (+21.1%)
  8. dist-ohos-armv7: 1h 14m -> 59m 32s (-20.2%)
  9. dist-i686-msvc: 1h 59m -> 2h 23m (+19.9%)
  10. x86_64-gnu-aux: 2h 13m -> 1h 47m (-19.8%)
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 (e95e732): comparison URL.

Overall result: ❌✅ regressions and improvements - please read:

Our benchmarks found a performance regression caused by this PR.
This might be an actual regression, but it can also be just noise.

Next Steps:

  • If the regression was expected or you think it can be justified,
    please write a comment with sufficient written justification, and add
    @rustbot label: +perf-regression-triaged to it, to mark the regression as triaged.
  • If you think that you know of a way to resolve the regression, try to create
    a new PR with a fix for the regression.
  • If you do not understand the regression or you think that it is just noise,
    you can ask the @rust-lang/wg-compiler-performance working group for help (members of this group
    were already notified of this PR).

@rustbot label: +perf-regression
cc @rust-lang/wg-compiler-performance

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

mean range count
Regressions ❌
(primary)
0.2% [0.1%, 0.3%] 3
Regressions ❌
(secondary)
0.5% [0.2%, 0.7%] 25
Improvements ✅
(primary)
-0.3% [-0.3%, -0.3%] 1
Improvements ✅
(secondary)
-1.2% [-1.8%, -0.5%] 2
All ❌✅ (primary) 0.1% [-0.3%, 0.3%] 4

Max RSS (memory usage)

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

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

mean range count
Regressions ❌
(primary)
2.3% [2.3%, 2.3%] 1
Regressions ❌
(secondary)
0.6% [0.6%, 0.6%] 1
Improvements ✅
(primary)
-2.0% [-2.2%, -1.8%] 2
Improvements ✅
(secondary)
-1.9% [-3.3%, -0.6%] 2
All ❌✅ (primary) -0.6% [-2.2%, 2.3%] 3

Cycles

Results (secondary 1.0%)

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.7% [0.6%, 4.0%] 4
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-1.1% [-1.6%, -0.7%] 3
All ❌✅ (primary) - - 0

Binary size

Results (primary -0.0%, 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.2% [0.2%, 0.2%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-0.1% [-0.1%, -0.0%] 30
Improvements ✅
(secondary)
-0.1% [-0.6%, -0.0%] 22
All ❌✅ (primary) -0.0% [-0.1%, 0.2%] 31

Bootstrap: 495.494s -> 493.455s (-0.41%)
Artifact size: 394.42 MiB -> 394.43 MiB (0.00%)

@rustbot rustbot added the perf-regression Performance regression. label May 5, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-CI Area: Our Github Actions CI A-testsuite Area: The testsuite used to check the correctness of rustc merged-by-bors This PR was explicitly merged by bors. perf-regression Performance regression. rollup A PR which is a rollup T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-clippy Relevant to the Clippy team. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-infra Relevant to the infrastructure 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-rust-analyzer Relevant to the rust-analyzer 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. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)

Projects

None yet

Development

Successfully merging this pull request may close these issues.