Skip to content

Conversation

@hoodmane
Copy link
Contributor

@hoodmane hoodmane commented Oct 1, 2025

As specified by MCP
Resolves #148309
Resolves #112195

@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. labels Oct 1, 2025
@rustbot
Copy link
Collaborator

rustbot commented Oct 1, 2025

r? @lcnr

rustbot has assigned @lcnr.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rust-log-analyzer

This comment has been minimized.

@lcnr
Copy link
Contributor

lcnr commented Oct 1, 2025

I think this is blocked on a team decision?

@lcnr lcnr added S-waiting-on-team DEPRECATED: Use the team-based variants `S-waiting-on-t-lang`, `S-waiting-on-t-compiler`, ... S-waiting-on-MCP Status: PR has a compiler MCP and is waiting for the compiler MCP to complete. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. S-waiting-on-team DEPRECATED: Use the team-based variants `S-waiting-on-t-lang`, `S-waiting-on-t-compiler`, ... labels Oct 1, 2025
@hoodmane hoodmane marked this pull request as draft October 1, 2025 15:20
@rustbot rustbot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Oct 1, 2025
@hoodmane
Copy link
Contributor Author

hoodmane commented Oct 1, 2025

Indeed, waiting-on-MCP is the correct description. I turned it to a draft too, but I think it can merge as is once the MCP is approved.

@hoodmane
Copy link
Contributor Author

hoodmane commented Oct 1, 2025

Well I guess test_unstable_options_tracking_hash will need to be updated too.

@hoodmane hoodmane marked this pull request as ready for review October 30, 2025 20:10
@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 30, 2025
@rustbot

This comment has been minimized.

@rustbot

This comment has been minimized.

@hoodmane hoodmane force-pushed the wasm-eh-default-on branch 2 times, most recently from 434c3ca to e8f5d21 Compare October 30, 2025 20:40
@rustbot
Copy link
Collaborator

rustbot commented Oct 30, 2025

Some changes occurred in src/doc/rustc/src/platform-support

cc @Noratrieb

@rust-log-analyzer

This comment has been minimized.

@lcnr
Copy link
Contributor

lcnr commented Nov 26, 2025

r? @bjorn3 as the one who approved the MCP

@hoodmane
Copy link
Contributor Author

hoodmane commented Dec 2, 2025

Okay Emscripten 4.0.21 was released yesterday so I think this is ready to move forward.

@bjorn3
Copy link
Member

bjorn3 commented Dec 2, 2025

CI fails.

@hoodmane
Copy link
Contributor Author

hoodmane commented Dec 2, 2025

The test feature-gate-cfg-emscripten-wasm-eh.rs is failing.

//@ compile-flags: --check-cfg=cfg(emscripten_wasm_eh)
#[cfg(not(emscripten_wasm_eh))]
//~^ ERROR `cfg(emscripten_wasm_eh)` is experimental
fn main() {}

I guess I need to negate the not() -- because it's on by default, we're getting an error that there is no main().

@rustbot

This comment has been minimized.

@rustbot
Copy link
Collaborator

rustbot commented Dec 2, 2025

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@hoodmane
Copy link
Contributor Author

hoodmane commented Dec 3, 2025

Okay CI looks green now

@bjorn3
Copy link
Member

bjorn3 commented Dec 4, 2025

@bors r+

@bors
Copy link
Collaborator

bors commented Dec 4, 2025

📌 Commit f07a84f has been approved by bjorn3

It is now in the queue for this repository.

@bors bors 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 Dec 4, 2025
bors added a commit that referenced this pull request Dec 4, 2025
Rollup of 9 pull requests

Successful merges:

 - #147224 (Emscripten: Turn wasm-eh on by default)
 - #149405 (Recover on misspelled item keyword)
 - #149443 (Tidying up UI tests [6/N])
 - #149524 (Move attribute safety checking to attribute parsing)
 - #149593 (powf, powi: point out SNaN non-determinism)
 - #149605 (Use branch name instead of HEAD when unshallowing)
 - #149612 (Apply the `bors` environment also to the `outcome` job)
 - #149623 (Don't require a normal tool build of clippy/rustfmt when running their test steps)
 - #149627 (Point to the item that is incorrectly annotated with `#[diagnostic::on_const]`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit c80ac0f into rust-lang:main Dec 5, 2025
11 checks passed
@rustbot rustbot added this to the 1.93.0 milestone Dec 5, 2025
rust-timer added a commit that referenced this pull request Dec 5, 2025
Rollup merge of #147224 - hoodmane:wasm-eh-default-on, r=bjorn3

Emscripten: Turn wasm-eh on by default

As specified by [MCP](rust-lang/compiler-team#920)
Resolves #148309
Resolves #112195
github-actions bot pushed a commit to rust-lang/miri that referenced this pull request Dec 5, 2025
Rollup of 9 pull requests

Successful merges:

 - rust-lang/rust#147224 (Emscripten: Turn wasm-eh on by default)
 - rust-lang/rust#149405 (Recover on misspelled item keyword)
 - rust-lang/rust#149443 (Tidying up UI tests [6/N])
 - rust-lang/rust#149524 (Move attribute safety checking to attribute parsing)
 - rust-lang/rust#149593 (powf, powi: point out SNaN non-determinism)
 - rust-lang/rust#149605 (Use branch name instead of HEAD when unshallowing)
 - rust-lang/rust#149612 (Apply the `bors` environment also to the `outcome` job)
 - rust-lang/rust#149623 (Don't require a normal tool build of clippy/rustfmt when running their test steps)
 - rust-lang/rust#149627 (Point to the item that is incorrectly annotated with `#[diagnostic::on_const]`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bjorn3 bjorn3 added the relnotes Marks issues that should be documented in the release notes of the next release. label Dec 5, 2025
@hoodmane hoodmane deleted the wasm-eh-default-on branch December 5, 2025 17:14
@hoodmane
Copy link
Contributor Author

hoodmane commented Dec 5, 2025

Thanks @bjorn3!

hoodmane added a commit to hoodmane/pyodide that referenced this pull request Dec 10, 2025
Since this commit `-Z emscripten-wasm-eh` is the default for the Rust compiler:
rust-lang/rust#147224
This switches to a recent Rust nightly which includes this change. This means we don't
need a custom sysroot anymore.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

relnotes Marks issues that should be documented in the release notes of the next release. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. S-waiting-on-MCP Status: PR has a compiler MCP and is waiting for the compiler MCP to complete. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Tracking issue for MCP 920: Turn emscripten-wasm-eh unwinding ABI on by default Support wasm exception handling for Emscripten target

6 participants