Skip to content

Rollup of 2 pull requests - #163859

Closed
jhpratt wants to merge 6 commits into
rust-lang:mainfrom
jhpratt:rollup-h3CIcqD
Closed

jhpratt wants to merge 6 commits into
rust-lang:mainfrom
jhpratt:rollup-h3CIcqD

Conversation

@jhpratt

@jhpratt jhpratt commented Oct 6, 2026

Copy link
Copy Markdown
Member

Successful merges:

r? @ghost

Create a similar rollup

xonx4l and others added 6 commits September 25, 2026 17:52
… 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.
…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
@rust-bors rust-bors Bot added the rollup A PR which is a rollup label Oct 6, 2026
@rustbot 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
@jhpratt

jhpratt commented Oct 6, 2026

Copy link
Copy Markdown
Member Author

@bors r+ p=5 force

@rust-bors

rust-bors Bot commented Oct 6, 2026

Copy link
Copy Markdown
Contributor

📌 Commit d47b123 has been approved by jhpratt

It is now in the queue for this repository.

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

This comment has been minimized.

rust-bors Bot pushed a commit that referenced this pull request Oct 6, 2026
Rollup of 2 pull requests

Successful merges:

 - #163348 (perf:cache FFI safety results in improper_ctypes lint)
 - #163809 (Adjust the adjustment to wasi TLS to no longer adjust)
@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 Oct 6, 2026
@rust-bors

rust-bors Bot commented Oct 6, 2026

Copy link
Copy Markdown
Contributor

💔 Test for 5c25829 failed: CI. Failed job:

@rust-log-analyzer

Copy link
Copy Markdown
Collaborator

A job failed! Check out the build log: (web) (plain enhanced) (plain)

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

@jhpratt

jhpratt commented Oct 6, 2026

Copy link
Copy Markdown
Member Author

I don't care enough to retry a rollup for the third time. It's only two PRs.

@jhpratt jhpratt closed this Oct 6, 2026
@rust-bors rust-bors Bot added 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
@rustbot rustbot removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 6, 2026
@rust-bors

rust-bors Bot commented Oct 6, 2026

Copy link
Copy Markdown
Contributor

This pull request was unapproved due to being closed.

@jhpratt
jhpratt deleted the rollup-h3CIcqD branch October 6, 2026 05:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollup A PR which is a rollup S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. 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.

5 participants