Rollup of 3 pull requests by jhpratt · Pull Request #163858 · rust-lang/rust

jhpratt · 2026-10-06T04:31:51Z

Successful merges:

Switch TLS implementation for wasi and bump SDK version to 34 #163809 (Adjust the adjustment to wasi TLS to no longer adjust)
perf:cache FFI safety results in improper_ctypes lint #163348 (perf:cache FFI safety results in improper_ctypes lint)
comptime fn error: suggest wrapping in const block #163772 (comptime fn error: suggest wrapping in const block)

It won't always be correct, since all values captured by a const block must also be determined at compile time, but it should usually work or be a step in the right direction

@alexcrichton

…crichton,clarfonthey Adjust the adjustment to wasi TLS to no longer adjust Fixes rust-lang#163748 Effectively reverts rust-lang#160868 to unrevert the changes to wasi from rust-lang#159733. As explained in rust-lang#160868, now that we use wasi-sdk-34 (since rust-lang#161773), the bug in wasi-libc that motivated the workaround should no longer be an issue. To reflect the fact that we're now relying on version 34, I've also adjusted the minimum SDK version mentioned in the target docs. Note: This could probably be backported to beta, but as this is only a tier 2 target, and 1.99 is already affected by the issue, I don't think this is necessary. cc @alexcrichton r? @clarfonthey

… r=nnethercote perf:cache FFI safety results in improper_ctypes lint This PR cache FFI safety results in improper_ctypes lint . ImproperCTypesVisitor's cache field is recreated empty at every call site, so a struct type gets fully re-walked from scratch each time instead of once . The implementation here moves the cache onto ImproperCtypesLint, so it remembers types we already checked and found FFI-safe, so we don't check the same type again every time it shows up in another function. We only remember "safe" types, never "unsafe" ones. That way we never need to keep the actual type around, just a fingerprint of it.Thus it persists across a whole module worth of foreign items.

comptime fn error: suggest wrapping in const block It won't always be correct, since all values captured by a const block must also be determined at compile time, but it should usually work or be a step in the right direction

jhpratt · 2026-10-06T04:32:10Z

@bors r+ p=5 force

rust-bors · 2026-10-06T04:32:13Z

📌 Commit c71e9c7 has been approved by jhpratt

It is now in the queue for this repository.

Rollup of 3 pull requests Successful merges: - #163809 (Adjust the adjustment to wasi TLS to no longer adjust) - #163348 (perf:cache FFI safety results in improper_ctypes lint) - #163772 (comptime fn error: suggest wrapping in const block)

rust-log-analyzer · 2026-10-06T04:56:48Z

The job test-x86_64-gnu-llvm-22-3 failed! Check out the build log: (web) (plain enhanced) (plain)

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

To only update this specific test, also pass `--test-args attributes/doc_examples/rustc_comptime.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/stage1/bin/rustc" "/checkout/tests/ui/attributes/doc_examples/rustc_comptime.rs" "-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/stage1" "--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" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/attributes/doc_examples/rustc_comptime" "-Znext-solver=coherence" "-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" "--edition=2015" "--crate-type" "lib" "-Z" "ui-testing=no"
stdout: none
--- stderr -------------------------------
error: comptime functions can only be called at compile time
##[error]  --> /checkout/tests/ui/attributes/doc_examples/rustc_comptime.rs:10:5
   |

rust-bors · 2026-10-06T04:57:40Z

💔 Test for 09d8229 failed: CI. Failed job:

auto - test-x86_64-gnu-llvm-22-3 (web logs, enhanced plaintext logs)

rust-bors · 2026-10-06T05:03:36Z

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

rust-log-analyzer · 2026-10-06T05:45:47Z

The job test-x86_64-gnu-gcc failed! Check out the build log: (web) (plain enhanced) (plain)

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

To only update this specific test, also pass `--test-args attributes/doc_examples/rustc_comptime.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/attributes/doc_examples/rustc_comptime.rs" "-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" "-Zcodegen-backend=gcc" "--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" "--emit" "metadata" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/ui/attributes/doc_examples/rustc_comptime" "-Znext-solver=coherence" "-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" "--edition=2015" "--crate-type" "lib" "-Z" "ui-testing=no"
stdout: none
--- stderr -------------------------------
error: comptime functions can only be called at compile time
##[error]  --> /checkout/tests/ui/attributes/doc_examples/rustc_comptime.rs:10:5
   |

Important

For more information how to resolve CI failures of this job, visit this link.

xonx4l and others added 8 commits September 25, 2026 17:52

cache results in improper_ctypes lint

5e9dca9

fix build errors

fa3bfde

comptime fn error: suggest wrapping in const block

18ecbb5

It won't always be correct, since all values captured by a const block must also be determined at compile time, but it should usually work or be a step in the right direction

Adjust the adjustment to wasi TLS to no longer adjust

341977a

factor out as check_ffi_type method

54a6d2e

rust-bors Bot added the rollup A PR which is a rollup label Oct 6, 2026

rustbot added 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. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Oct 6, 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 Oct 6, 2026

rust-bors Bot mentioned this pull request Oct 6, 2026

Switch TLS implementation for wasi and bump SDK version to 34 #163809

Merged

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 Oct 6, 2026

jhpratt mentioned this pull request Oct 6, 2026

comptime fn error: suggest wrapping in const block #163772

Merged

rust-bors Bot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 6, 2026

jhpratt closed this Oct 6, 2026

jhpratt deleted the rollup-ggeG0EC branch October 6, 2026 05:38

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

Navigation Menu

Repository navigation

Rollup of 3 pull requests - #163858

Rollup of 3 pull requests#163858
jhpratt wants to merge 8 commits into
rust-lang:mainfrom
jhpratt:rollup-ggeG0EC

jhpratt commented Oct 6, 2026

Uh oh!

jhpratt commented Oct 6, 2026

Uh oh!

rust-bors Bot commented Oct 6, 2026

Uh oh!

This comment has been minimized.

rust-log-analyzer commented Oct 6, 2026

Uh oh!

rust-bors Bot commented Oct 6, 2026

Uh oh!

rust-bors Bot commented Oct 6, 2026

Uh oh!

rust-log-analyzer commented Oct 6, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Conversation

jhpratt commented Oct 6, 2026

Uh oh!

jhpratt commented Oct 6, 2026

Uh oh!

rust-bors Bot commented Oct 6, 2026

Uh oh!

This comment has been minimized.

rust-log-analyzer commented Oct 6, 2026

Uh oh!

rust-bors Bot commented Oct 6, 2026

Uh oh!

rust-bors Bot commented Oct 6, 2026

Uh oh!

rust-log-analyzer commented Oct 6, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants