Rollup of 20 pull requests by jhpratt · Pull Request #159888 · rust-lang/rust

jhpratt · 2026-07-25T08:59:49Z

Successful merges:

Support using const pointers in asm const operand #138618 (Support using const pointers in asm const operand)
Lower paths to functions in const args as ConstKind::Error #157962 (Lower paths to functions in const args as ConstKind::Error)
trait_solver: normalize next-gen region constraints #158404 (trait_solver: normalize next-gen region constraints)
rustdoc: warn on improperly interleaved HTML/MD #158709 (rustdoc: warn on improperly interleaved HTML/MD)
document #[global_allocator] constraints #159720 (document #[global_allocator] constraints)
optimization: don't look for diagnostic/canonical items without rustc_attrs enabled #159732 (optimization: don't look for diagnostic/canonical items without rustc_attrs enabled)
implement CovariantUnsafeCell #159738 (implement CovariantUnsafeCell)
reuse regular exported_non_generic_symbols logic in Miri #159740 (reuse regular exported_non_generic_symbols logic in Miri)
check extern "custom" function pointers #159780 (check extern "custom" function pointers)
rustdoc-js: ignore editor temp files in test folder discovery #159786 (rustdoc-js: ignore editor temp files in test folder discovery)
std::sync::poison: disable auto_cfg on PoisonError::new #159819 (std::sync::poison: disable auto_cfg on PoisonError::new)
stepping into where-clauses during normalization may be productive #155388 (stepping into where-clauses during normalization may be productive)
when bailing on ambiguity, don't force other results to ambig #155914 (when bailing on ambiguity, don't force other results to ambig)
Fix(lib/fs/win): Fall back on Win32 delete for Dir::remove_file #159439 (Fix(lib/fs/win): Fall back on Win32 delete for Dir::remove_file)
Update wasm-component-ld to 0.5.27 #159676 (Update wasm-component-ld to 0.5.27)
allow accessing the contents of UnsafeCell without going through get #159730 (allow accessing the contents of UnsafeCell without going through get)
Avoid #[target_features] #159809 (Avoid #[target_features])
Remove redundant #[rustc_paren_sugar] feature gate #159826 (Remove redundant #[rustc_paren_sugar] feature gate)
Updated expect messages for CString struct and method documentation #159853 (Updated expect messages for CString struct and method documentation)
Revert "Export derive at core::derive and std::derive" #159877 (Revert "Export derive at core::derive and std::derive")

Co-authored-by: Noah Lev <camelidcamel@gmail.com>

This is probably not what the user wants: error: nested Markdown emphasis in HTML `style` tag --> $DIR/invalid-html-tags-correct-script-style.rs:11:16 | LL | /// One <style>*emph*</style> | ^^^^^^ Markdown translates this into HTML, but the browser parses it as CSS | help: to turn off Markdown parsing, put the tag at the start of the line | LL ~ /// One LL ~ /// <style>*emph*</style> |

The `test_dir_remove_file` test currently fails under Windows 7 on: ``` thread 'fs::tests::test_dir_remove_file' (2028) panicked at library/std/src/fs/tests.rs:2590:5: dir.remove_file("foo.txt") failed with: The parameter is incorrect. (os error 87) ``` Looking into it, this is because the `FILE_DISPOSITION_INFO_EX` variant of the `SetFileInformationByHandle` API is used while it is only available starting from Windows 10 1607. However, `FILE_DISPOSITION_INFO` is still available since Vista. This is therefore fixed by introducing a fallback to the latter API if the former fails. This is achieved by re-using some logic that is already available through `File::delete` and that does exactly this. Signed-off-by: Paul Mabileau <paul.mabileau@harfanglab.fr>

Canonicalize and evaluate next-gen region constraints before query response canonicalization so equivalent constraints merge structurally.

Cover the dyn object supertrait case that used to leave equivalent next-gen region constraints in different shapes.

Keeping up-to-date

This is currently a no-op, but will be useful when const in `global_asm!` can be pointers.

Currently global_asm already have symbol names when using v0 scheme, this makes them obtain symbols with legacy scheme too.

This gives the asm-const code the basic ability to deal wiht pointer and provenances, which lays the ground work for asm_const_ptr. Note that `SymStatic` is not fully removed, a specialized is kept and renamed as `SymThreadLocalStatic`, for `#[thread_local]` statics where CTFE does not support naming. The `#[thread_local]` is unstable feature and it's not clear if we want to support this in `sym`, but removal of it should be a separate PR.

With the previous commit, now we can see there are some code duplication for the handling of `GlobalAlloc` inside backends. Do some clean up to unify them.

CTFE pointers created via type ID, `without_provenance` or pointers to const ZSTs can now be codegenned with all 3 backends. These pointers are generated in the same way as integers.

…_attrs enabled

also add a test for cross-crate static initializers

…/ raw_get

…ef const after scheduling. That works only when a later phase emits a real diagnostics. For function item (associated fn), the lowering needs parent trait and self args

@Nadrieril

…uctive, r=BoxyUwU stepping into where-clauses during normalization may be productive fixes rust-lang/trait-system-refactor-initiative#273, see that issue for more info. Whether stepping into a where-clause is productive depends not on whether we're proving a `NormalizesTo` or `Trait` goal, but instead on how both the impl and the cycle rely on it. In the example in tests/ui/traits/next-solver/cycles/normalizes-to-is-not-productive-2.rs this is just a productive use given the way @Nadrieril and I are thinking about it right now. We're changing such cycles to be ambiguous for now, so this does not commit us to anything. This previously caused a lot of breakage when normalizing where-clauses, e.g. rust-lang/trait-system-refactor-initiative#176, however with rust-lang#158643 that is no longer an issue. We will need to figure out what to do here if we want to properly fix `ParamEnv` normalization in the future r? @BoxyUwU or @nikomatsakis

…=BoxyUwU when bailing on ambiguity, don't force other results to ambig A smaller version of rust-lang#149904 which doesn't cause the perf issue in bevy, or at least in the minimization While not necessarily necessary for rust-lang/trait-system-refactor-initiative#257 due to rust-lang#158643. This does fix the underlying issues there. This change does affect `binius_field`, the remaining issues are tracked in rust-lang/trait-system-refactor-initiative#274. The core idea is that for - A - B - A (cycle with initial result) - B <--- We normally run A until we reach a fixpoint. We don't do so in case trying to do so encounters overflow or the result of `A` ends up ambiguous to avoid performance issues. We want to generally keep the provisional cache entries which depend on A around. Evaluating these goals depends on the current provisional result of A. This means it is fine to keep them around if A reached a fixpoint. If we bail without reaching a fixpoint, the provisional result used while computing B differs from the final result of A. This means the entry for B is not valid and we'd need to discard it. Discarding all nested provisional cache entries when not reaching a fixpoint causes perf issues. In case the final result of A is ambiguous, then this PR keeps nested cache entries which are ambiguous and don't have any inference constraints around. That is sound, as having more goals be ambiguous is never an issue, the trait solver can always say ":shrug: idk". It also shouldn't cause any incorrect ambiguity errors issues, as changing the provisional result of A to be ambiguity should not change B to go from being ambiguous to something else. The current implementation mutated the result of all nested provisional cache entries to be ambiguous, which resulted in incorrect ambiguity errors in rust-lang/trait-system-refactor-initiative#257. This PR differs from that by dropping goals whose result isn't already ambiguous. That's means we don't keep quite as many cache entries around, which is potentially worse for perf, but from what I can tell this doens't cause issues in practice. r? BoxyUwU

@roblabla

…ove-file, r=ChrisDenton Fix(lib/fs/win): Fall back on Win32 delete for `Dir::remove_file` The `test_dir_remove_file` test currently fails under Windows 7 on: ``` thread 'fs::tests::test_dir_remove_file' (2028) panicked at library/std/src/fs/tests.rs:2590:5: dir.remove_file("foo.txt") failed with: The parameter is incorrect. (os error 87) ``` Looking into it, this is because the `FILE_DISPOSITION_INFO_EX` variant of the `SetFileInformationByHandle` API is used while it is only available starting from Windows 10 1607. However, `FILE_DISPOSITION_INFO` is still available since Vista. This is therefore fixed by introducing a fallback to the latter API if the former fails. This is achieved by re-using some logic that is already available through `File::delete` and that does exactly this. cc rust-lang#120426 @roblabla @the8472 @ChrisDenton @RalfJung @rustbot label A-io T-libs O-Windows-7

…-ld, r=Mark-Simulacrum Update wasm-component-ld to 0.5.27 Keeping up-to-date

@jethrogb

allow accessing the contents of UnsafeCell without going through get This has been FCP'd by @rust-lang/opsem in rust-lang/unsafe-code-guidelines#281. @rust-lang/lang since this is a change very deep in the details of the aliasing model, I assume it's fine to just FYI you here, but please stop me if that is not right. The first commit attempts to clarify some potentially-confusing parts of the docs. @jethrogb I hope this helps somewhat resolve the confusion that these docs previously caused. Closes rust-lang/unsafe-code-guidelines#281

@oli-obk

…ssages, r=oli-obk Avoid `#[target_features]` The string `#[target_features]` is used in various error messages as well as the compiler's code. But there is no such attribute, which I found very confusing. I think it means "one or more target features", e.g. covering both `#[target_feature(foo)]` and `#[target_feature(foo, bar, baz)]`. We already use `#[target_feature(..)]` for that meaning in several places. So this commit changes all `#[target_features]` occurrences to `#[target_feature(..)]`. It also changes a few `#[target_feature]` (no plural) occurrences to `#[target_feature(..)]` for consistency with other mentions nearby in error messages. r? @oli-obk

@JonathanBrouwer

Remove redundant `#[rustc_paren_sugar]` feature gate It is already gated on `rustc_attrs`. Alternatively we could update attribute parsing to optionally require multiple features, but that seems unnecessary. r? @JonathanBrouwer

Updated expect messages for `CString` struct and method documentation Completes a task with rust-lang#159751. Updates the expect messages in `library/alloc/src/ffi/c_str.rs`.

Revert "Export `derive` at `core::derive` and `std::derive`" This reverts commit fec0998. Temporarily addresses rust-lang#159856 until we get the stability attribute to actually work...

jhpratt · 2026-07-25T09:00:01Z

@bors r+ rollup=never p=5

rust-bors · 2026-07-25T09:00:05Z

📌 Commit 168cd54 has been approved by jhpratt

It is now in the queue for this repository.

Rollup of 20 pull requests Successful merges: - #138618 (Support using const pointers in asm `const` operand) - #157962 (Lower paths to functions in const args as ConstKind::Error) - #158404 (trait_solver: normalize next-gen region constraints) - #158709 (rustdoc: warn on improperly interleaved HTML/MD) - #159720 (document #[global_allocator] constraints) - #159732 (optimization: don't look for diagnostic/canonical items without rustc_attrs enabled) - #159738 (implement `CovariantUnsafeCell`) - #159740 (reuse regular exported_non_generic_symbols logic in Miri) - #159780 (check `extern "custom"` function pointers) - #159786 (rustdoc-js: ignore editor temp files in test folder discovery) - #159819 (std::sync::poison: disable auto_cfg on PoisonError::new) - #155388 (stepping into where-clauses during normalization may be productive) - #155914 (when bailing on ambiguity, don't force other results to ambig) - #159439 (Fix(lib/fs/win): Fall back on Win32 delete for `Dir::remove_file`) - #159676 (Update wasm-component-ld to 0.5.27) - #159730 (allow accessing the contents of UnsafeCell without going through get) - #159809 (Avoid `#[target_features]`) - #159826 (Remove redundant `#[rustc_paren_sugar]` feature gate) - #159853 (Updated expect messages for `CString` struct and method documentation) - #159877 (Revert "Export `derive` at `core::derive` and `std::derive`")

rust-log-analyzer · 2026-07-25T11:29:02Z

The job optional-x86_64-gnu-parallel-frontend failed! Check out the build log: (web) (plain enhanced) (plain)

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

diff of stderr:

20 LL | |     Self::Item: Baz,
21    | |____________________^
22    = note: ...which again requires coherence checking all impls of trait `Foo`, completing the cycle
- note: cycle used when checking that `<impl at $DIR/next-solver-region-resolution.rs:12:1: 14:20>` is well-formed
-   --> $DIR/next-solver-region-resolution.rs:12:1
+ note: cycle used when checking that `<impl at $DIR/next-solver-region-resolution.rs:18:1: 20:21>` is well-formed
+   --> $DIR/next-solver-region-resolution.rs:18:1
25    |
- LL | / impl<'a, T> Foo for &'a T
+ LL | / impl<'a, T> Foo for &T
27 LL | | where
- LL | |     Self::Item: 'a,
-    | |___________________^
+ LL | |     Self::Item: Baz,
+    | |____________________^
30    = note: for more information, see <https://rustc-dev-guide.rust-lang.org/overview.html#queries> and <https://rustc-dev-guide.rust-lang.org/query.html>
31 
32 error: aborting due to 1 previous error

Note: some mismatched output was normalized before being compared
- note: cycle used when checking that `<impl at /checkout/tests/ui/specialization/min_specialization/next-solver-region-resolution.rs:18:1: 20:21>` is well-formed
-   --> /checkout/tests/ui/specialization/min_specialization/next-solver-region-resolution.rs:18:1
+ note: cycle used when checking that `<impl at $DIR/next-solver-region-resolution.rs:18:1: 20:21>` is well-formed
+   --> $DIR/next-solver-region-resolution.rs:18:1
+ LL | / impl<'a, T> Foo for &T
+ LL | |     Self::Item: Baz,
+    | |____________________^

Compare output by lines enabled, diff by lines:
Expected contains these lines that are not in actual:
   | |___________________^
  --> $DIR/next-solver-region-resolution.rs:12:1
LL | / impl<'a, T> Foo for &'a T
LL | |     Self::Item: 'a,
note: cycle used when checking that `<impl at $DIR/next-solver-region-resolution.rs:12:1: 14:20>` is well-formed
Actual contains these lines that are not in expected:
   | |____________________^
  --> $DIR/next-solver-region-resolution.rs:18:1
LL | / impl<'a, T> Foo for &T
LL | |     Self::Item: Baz,
note: cycle used when checking that `<impl at $DIR/next-solver-region-resolution.rs:18:1: 20:21>` is well-formed

The actual stderr differed from the expected stderr
To update references, rerun the tests and pass the `--bless` flag
To only update this specific test, also pass `--test-args specialization/min_specialization/next-solver-region-resolution.rs`

error: 1 errors occurred comparing output.
status: exit status: 1
command: env -u RUSTC_LOG_COLOR RUSTC_ICE="0" RUST_BACKTRACE="short" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/tests/ui/specialization/min_specialization/next-solver-region-resolution.rs" "-Zthreads=1" "-Zsimulate-remapped-rust-src-base=/rustc/FAKE_PREFIX" "-Ztranslate-remapped-path-to-local-path=no" "-Z" "ignore-directory-in-diagnostics-source-blocks=/cargo" "-Z" "ignore-directory-in-diagnostics-source-blocks=/checkout/vendor" "--sysroot" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2" "--target=x86_64-unknown-linux-gnu" "--check-cfg" "cfg(test,FALSE)" "--error-format" "json" "--json" "future-incompat" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Zwrite-long-types-to-disk=no" "-Cstrip=debuginfo" "-Zthreads=4" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/specialization/min_specialization/next-solver-region-resolution" "-A" "unused" "-W" "unused_attributes" "-A" "internal_features" "-A" "incomplete_features" "-A" "unused_parens" "-A" "unused_braces" "-Crpath" "-Cdebuginfo=0" "-Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "-Znext-solver=globally"
stdout: none
--- stderr -------------------------------
error[E0391]: cycle detected when coherence checking all impls of trait `Foo`
##[error]  --> /checkout/tests/ui/specialization/min_specialization/next-solver-region-resolution.rs:6:1
   |
LL | trait Foo { //~ ERROR cycle detected when coherence checking all impls of trait `Foo`
   | ^^^^^^^^^
   |
   = note: ...which requires building specialization graph of trait `Foo`...
note: ...which requires computing whether impls specialize one another...
  --> /checkout/tests/ui/specialization/min_specialization/next-solver-region-resolution.rs:12:1
   |
LL | / impl<'a, T> Foo for &'a T
LL | | where
LL | |     Self::Item: 'a,
   | |___________________^
note: ...which requires computing normalized predicates of `<impl at /checkout/tests/ui/specialization/min_specialization/next-solver-region-resolution.rs:18:1: 20:21>`...
  --> /checkout/tests/ui/specialization/min_specialization/next-solver-region-resolution.rs:18:1
   |
LL | / impl<'a, T> Foo for &T
LL | | where
LL | |     Self::Item: Baz,
   | |____________________^
   = note: ...which again requires coherence checking all impls of trait `Foo`, completing the cycle
note: cycle used when checking that `<impl at /checkout/tests/ui/specialization/min_specialization/next-solver-region-resolution.rs:18:1: 20:21>` is well-formed
  --> /checkout/tests/ui/specialization/min_specialization/next-solver-region-resolution.rs:18:1
   |
LL | / impl<'a, T> Foo for &T
LL | | where
LL | |     Self::Item: Baz,
   | |____________________^
   = note: for more information, see <https://rustc-dev-guide.rust-lang.org/overview.html#queries> and <https://rustc-dev-guide.rust-lang.org/query.html>

error: aborting due to 1 previous error

For more information about this error, try `rustc --explain E0391`.
------------------------------------------

rust-bors · 2026-07-25T12:17:07Z

💔 Test for 336190f failed: CI. Failed job:

auto - optional-x86_64-gnu-parallel-frontend (web logs, enhanced plaintext logs)

notriddle and others added 30 commits July 3, 2026 00:08

rustdoc: warn on improperly interleaved HTML/MD

3ffc0fb

rustdoc: add tests for MD/HTML interleaving

cb61eb4

Clean up and test paragraph and table warn

c9be91c

html_tags: remove in_code_block no-op branch

9bc15a8

html_tags: rename tags based on camelid's nit

047068a

Co-authored-by: Noah Lev <camelidcamel@gmail.com>

Normalize next-gen region constraints

f2476c5

Canonicalize and evaluate next-gen region constraints before query response canonicalization so equivalent constraints merge structurally.

Add regression test for object candidates

cb0e874

Cover the dyn object supertrait case that used to leave equivalent next-gen region constraints in different shapes.

Preserve normalized solver region constraints

30895ee

Normalize eagerly handled region constraints

f754b53

Update wasm-component-ld to 0.5.27

10100f2

Keeping up-to-date

stepping into NormalizesTo where-clauses may be productive

66d0fb8

Collect constants within global_asm! in collector

4233b3b

This is currently a no-op, but will be useful when const in `global_asm!` can be pointers.

Add FnDef/Closure -> FnPtr coercion for inline asm const operand

f44536c

Give global_asm symbol names

bf74b6c

Currently global_asm already have symbol names when using v0 scheme, this makes them obtain symbols with legacy scheme too.

Delay stringification of const to backend

b44bea2

Unify handling of GlobalAlloc inside backend

4c39d62

With the previous commit, now we can see there are some code duplication for the handling of `GlobalAlloc` inside backends. Do some clean up to unify them.

Handle pointers with offset for asm const

338d560

Support codegen of asm const pointers without provenance

6deaed5

CTFE pointers created via type ID, `without_provenance` or pointers to const ZSTs can now be codegenned with all 3 backends. These pointers are generated in the same way as integers.

Give codegen units symbol names that backend can use

1fd34e4

Generate unique symbol names if const pointers refer to promoted static

c95d35e

optimization: don't look for diagnostic/canonical items without rustc…

aabf824

…_attrs enabled

implement CovariantUnsafeCell

77977f9

add a test checking that CovariantUnsafeCell is covariant

c37239a

x test cargo-miri: run all subcrate tests as well

e3712ee

also add a test for cross-crate static initializers

clarify some potentially-confusing parts of the UnsafeCell docs

b7973ab

allow accessing the contents of UnsafeCell without going through get …

678de5f

…/ raw_get

Previously both free functions and associated functions creates a FnD…

8ed6fff

…ef const after scheduling. That works only when a later phase emits a real diagnostics. For function item (associated fn), the lowering needs parent trait and self args

jhpratt added 9 commits July 25, 2026 04:59

Rollup merge of rust-lang#159676 - alexcrichton:update-wasm-component…

02bc4c3

…-ld, r=Mark-Simulacrum Update wasm-component-ld to 0.5.27 Keeping up-to-date

Rollup merge of rust-lang#159853 - asder8215:cstr_expect, r=fee1-dead

fd70c28

Updated expect messages for `CString` struct and method documentation Completes a task with rust-lang#159751. Updates the expect messages in `library/alloc/src/ffi/c_str.rs`.

Rollup merge of rust-lang#159877 - fee1-dead-contrib:rev, r=jhpratt

168cd54

Revert "Export `derive` at `core::derive` and `std::derive`" This reverts commit fec0998. Temporarily addresses rust-lang#159856 until we get the stability attribute to actually work...

rust-bors Bot added the rollup A PR which is a rollup label Jul 25, 2026

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 Jul 25, 2026

This comment has been minimized.

Sign in to view

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 Jul 25, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Rollup of 20 pull requests#159888

Rollup of 20 pull requests#159888
jhpratt wants to merge 74 commits into
rust-lang:mainfrom
jhpratt:rollup-EWfAsjw

jhpratt commented Jul 25, 2026

Uh oh!

jhpratt commented Jul 25, 2026

Uh oh!

rust-bors Bot commented Jul 25, 2026

Uh oh!

This comment has been minimized.

rust-log-analyzer commented Jul 25, 2026

Uh oh!

rust-bors Bot commented Jul 25, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

19 participants

Uh oh!

Uh oh!

Conversation

jhpratt commented Jul 25, 2026

Uh oh!

jhpratt commented Jul 25, 2026

Uh oh!

rust-bors Bot commented Jul 25, 2026

Uh oh!

This comment has been minimized.

rust-log-analyzer commented Jul 25, 2026

Uh oh!

rust-bors Bot commented Jul 25, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

19 participants