Rollup of 7 pull requests by GuillaumeGomez · Pull Request #156189 · rust-lang/rust

GuillaumeGomez · 2026-05-05T12:08:22Z

Successful merges:

generic_const_args: allow paths to non type consts #155341 (generic_const_args: allow paths to non type consts)
resolve: Catch "cannot reexport" errors from macros 2.0 better #156014 (resolve: Catch "cannot reexport" errors from macros 2.0 better)
Print HRTB binders before fn qualifiers #156058 (Print HRTB binders before fn qualifiers)
Revert "remove MethodReceiverExpr special-casing" #156184 (Revert "remove MethodReceiverExpr special-casing")
Revert const hacks and use const closures in std #155957 (Revert const hacks and use const closures in std)
Update askama version to 0.16.0 #156127 (Update askama version to 0.16.0)
Remove duplicate debug assert #156183 (Remove duplicate debug assert)

…rate function

This reverts commit 5ad560f and adds a regression test.

@BoxyUwU

generic_const_args: allow paths to non type consts tracking issue: rust-lang#151972 Non type consts should be usable in the type system in `feature(generic_const_args)`. These are directly plugged into the constant evaluator, unlike type consts, which are attempted to be reasoned about by the type system. Inherent associated constants are not supported at this time, due to complications around how generic arguments are represented for them (it's currently a mess). The mess is being cleaned up (e.g. rust-lang#154758), so instead of trying to hack support in before the refactoring is done, let's just wait to be able to implement it more cleanly. r? @BoxyUwU

@mu001999

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

@petrochenkov

…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

@Urgau

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.

GuillaumeGomez · 2026-05-05T12:08:34Z

@bors r+ p=5 rollup=never

rust-bors · 2026-05-05T12:08:38Z

📌 Commit d6dc695 has been approved by GuillaumeGomez

It is now in the queue for this repository.

rust-bors · 2026-05-05T12:25:03Z

PR #155341, which is a member of this rollup, was unapproved.

This rollup was thus unapproved.

rust-log-analyzer · 2026-05-05T13:22:26Z

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

Click to see the possible cause of the failure (guessed by this bot)

##[endgroup]
Executing "/scripts/stage_2_test_set2.sh"
+ /scripts/stage_2_test_set2.sh
+ '[' 1 == 1 ']'
+ echo 'PR_CI_JOB set; skipping tidy'
+ SKIP_TIDY='--skip tidy'
+ ../x.py --stage 2 test --skip tidy --skip tests --skip coverage-map --skip coverage-run --skip library --skip tidyselftest
PR_CI_JOB set; skipping tidy
##[group]Building bootstrap
    Finished `dev` profile [unoptimized] target(s) in 0.04s
##[endgroup]
---

test result: FAILED. 0 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out; finished in 0.03s

Bootstrap failed while executing `--stage 2 test --skip tidy --skip tests --skip coverage-map --skip coverage-run --skip library --skip tidyselftest`
Command `/checkout/obj/build/bootstrap/debug/rustdoc -Wrustdoc::invalid_codeblock_attributes -Dwarnings -Znormalize-docs -Z unstable-options --test /checkout/src/doc/unstable-book/src/language-features/generic-const-args.md --test-args ` failed with exit code 101
Created at: src/bootstrap/src/core/builder/mod.rs:1479:23
Executed at: src/bootstrap/src/core/build_steps/test.rs:2910:13

--- BACKTRACE vvv
   0: std::backtrace_rs::backtrace::libunwind::trace
             at /rustc/ef0fb8a2563200e322fa4419f09f65a63742038c/library/std/src/../../backtrace/src/backtrace/libunwind.rs:117:9
   1: std::backtrace_rs::backtrace::trace_unsynchronized::<<std::backtrace::Backtrace>::create::{closure#0}>
             at /rustc/ef0fb8a2563200e322fa4419f09f65a63742038c/library/std/src/../../backtrace/src/backtrace/mod.rs:66:14
   2: <std::backtrace::Backtrace>::create
             at /rustc/ef0fb8a2563200e322fa4419f09f65a63742038c/library/std/src/backtrace.rs:331:13
   3: <bootstrap::utils::exec::DeferredCommand>::finish_process
             at /checkout/src/bootstrap/src/utils/exec.rs:939:17
   4: <bootstrap::utils::exec::DeferredCommand>::wait_for_output::<&bootstrap::utils::exec::ExecutionContext>
             at /checkout/src/bootstrap/src/utils/exec.rs:831:21
   5: <bootstrap::utils::exec::ExecutionContext>::run
             at /checkout/src/bootstrap/src/utils/exec.rs:741:45
   6: <bootstrap::utils::exec::BootstrapCommand>::run::<&bootstrap::core::builder::Builder>
             at /checkout/src/bootstrap/src/utils/exec.rs:339:27
   7: bootstrap::core::build_steps::test::markdown_test
             at /checkout/src/bootstrap/src/core/build_steps/test.rs:2910:13
   8: <bootstrap::core::build_steps::test::BookTest>::run_local_doc
             at /checkout/src/bootstrap/src/core/build_steps/test.rs:2750:13
---
  12: <bootstrap::core::builder::Builder>::ensure::<bootstrap::core::build_steps::test::UnstableBook>
             at /checkout/src/bootstrap/src/core/builder/mod.rs:1595:36
  13: <bootstrap::core::build_steps::test::UnstableBook as bootstrap::core::builder::Step>::make_run
             at /checkout/src/bootstrap/src/core/build_steps/test.rs:2782:33
  14: <bootstrap::core::builder::StepDescription>::maybe_run
             at /checkout/src/bootstrap/src/core/builder/mod.rs:476:13
  15: bootstrap::core::builder::cli_paths::match_paths_to_steps_and_run
             at /checkout/src/bootstrap/src/core/builder/cli_paths.rs:141:22
  16: <bootstrap::core::builder::Builder>::run_step_descriptions
             at /checkout/src/bootstrap/src/core/builder/mod.rs:1138:9
  17: <bootstrap::core::builder::Builder>::execute_cli
             at /checkout/src/bootstrap/src/core/builder/mod.rs:1117:14
  18: <bootstrap::Build>::build
             at /checkout/src/bootstrap/src/lib.rs:803:25
  19: bootstrap::main
             at /checkout/src/bootstrap/src/bin/main.rs:130:11
  20: <fn() as core::ops::function::FnOnce<()>>::call_once
             at /rustc/ef0fb8a2563200e322fa4419f09f65a63742038c/library/core/src/ops/function.rs:250:5
  21: std::sys::backtrace::__rust_begin_short_backtrace::<fn(), ()>
             at /rustc/ef0fb8a2563200e322fa4419f09f65a63742038c/library/std/src/sys/backtrace.rs:166:18
  22: std::rt::lang_start::<()>::{closure#0}
             at /rustc/ef0fb8a2563200e322fa4419f09f65a63742038c/library/std/src/rt.rs:206:18
  23: <&dyn core::ops::function::Fn<(), Output = i32> + core::panic::unwind_safe::RefUnwindSafe + core::marker::Sync as core::ops::function::FnOnce<()>>::call_once
             at /rustc/ef0fb8a2563200e322fa4419f09f65a63742038c/library/core/src/ops/function.rs:287:21
  24: std::panicking::catch_unwind::do_call::<&dyn core::ops::function::Fn<(), Output = i32> + core::panic::unwind_safe::RefUnwindSafe + core::marker::Sync, i32>
             at /rustc/ef0fb8a2563200e322fa4419f09f65a63742038c/library/std/src/panicking.rs:581:40
  25: std::panicking::catch_unwind::<i32, &dyn core::ops::function::Fn<(), Output = i32> + core::panic::unwind_safe::RefUnwindSafe + core::marker::Sync>
             at /rustc/ef0fb8a2563200e322fa4419f09f65a63742038c/library/std/src/panicking.rs:544:19
  26: std::panic::catch_unwind::<&dyn core::ops::function::Fn<(), Output = i32> + core::panic::unwind_safe::RefUnwindSafe + core::marker::Sync, i32>
             at /rustc/ef0fb8a2563200e322fa4419f09f65a63742038c/library/std/src/panic.rs:359:14
  27: std::rt::lang_start_internal::{closure#0}
             at /rustc/ef0fb8a2563200e322fa4419f09f65a63742038c/library/std/src/rt.rs:175:24
  28: std::panicking::catch_unwind::do_call::<std::rt::lang_start_internal::{closure#0}, isize>
             at /rustc/ef0fb8a2563200e322fa4419f09f65a63742038c/library/std/src/panicking.rs:581:40
---
  35: __libc_start_main
  36: _start


Command has failed. Rerun with -v to see more details.
Build completed unsuccessfully in 0:51:29
  local time: Tue May  5 13:04:01 UTC 2026
  network time: Tue, 05 May 2026 13:04:02 GMT
##[error]Process completed with exit code 1.
##[group]Run echo "disk usage:"

qaijuang and others added 20 commits May 1, 2026 13:53

diagnostics: print HRTB binders before fn qualifiers

5dfe784

Update askama version to 0.16.0

89005b2

Regen proc_macro_dep

08aca77

resolve: Factor out reporting of "cannot reexport" errors into a sepa…

cf636ec

…rate function

resolve: Catch "cannot reexport" errors from macros 2.0 better

65e5bd6

resolve: Harden some invariant checks for visibilities

21c58d8

rust-analyzer: Fix pub_use_of_private_extern_crate lint

fadb747

Update askama version to 0.16.0 in clippy

45b9459

generic_const_args: allow paths to non type consts

c89c812

Remove const closure hacks in libstd

664177f

Revert const hack and use const closure

a015eb1

Remove duplicate debug assert

23cea55

Revert "remove MethodReceiverExpr special-casing"

ee35020

This reverts commit 5ad560f and adds a regression test.

Rollup merge of rust-lang#156184 - cyrgani:macros-are-weird, r=petroc…

a3df747

…henkov Revert "remove `MethodReceiverExpr` special-casing" This reverts commit 5ad560f and adds a regression test. Fixes rust-lang#156084. r? @petrochenkov

Rollup merge of rust-lang#156127 - GuillaumeGomez:update-askama, r=Urgau

226a8fd

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

Rollup merge of rust-lang#156183 - zetanumbers:rm_duplicate_dbg_ass, …

d6dc695

…r=mati865 Remove duplicate debug assert This is this.

rust-bors Bot added the rollup A PR which is a rollup label May 5, 2026

rustbot added 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) labels May 5, 2026

rust-bors Bot mentioned this pull request May 5, 2026

generic_const_args: allow paths to non type consts #155341

Open

JonathanBrouwer closed this May 5, 2026

rustbot removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label May 5, 2026

GuillaumeGomez deleted the rollup-HDFcck0 branch May 5, 2026 21:09

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 7 pull requests#156189

Rollup of 7 pull requests#156189
GuillaumeGomez wants to merge 20 commits intorust-lang:mainfrom
GuillaumeGomez:rollup-HDFcck0

GuillaumeGomez commented May 5, 2026

Uh oh!

GuillaumeGomez commented May 5, 2026

Uh oh!

rust-bors Bot commented May 5, 2026

Uh oh!

rust-bors Bot commented May 5, 2026

Uh oh!

rust-log-analyzer commented May 5, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

Uh oh!

Conversation

GuillaumeGomez commented May 5, 2026

Uh oh!

GuillaumeGomez commented May 5, 2026

Uh oh!

rust-bors Bot commented May 5, 2026

Uh oh!

rust-bors Bot commented May 5, 2026

Uh oh!

rust-log-analyzer commented May 5, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants