Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add target_env = "p1" to the wasm32-wasip1 target #125869

Merged
merged 3 commits into from
Jun 12, 2024

Conversation

alexcrichton
Copy link
Member

This commit sets the target_env key for the
wasm32-wasi{,p1,p1-threads} targets to the string "p1". This mirrors how the wasm32-wasip2 target has target_env = "p2". The intention of this is to more easily detect each target in downstream crates to enable adding custom code per-target.

cc #125803

This commit sets the `target_env` key for the
`wasm32-wasi{,p1,p1-threads}` targets to the string `"p1"`. This mirrors
how the `wasm32-wasip2` target has `target_env = "p2"`. The intention of
this is to more easily detect each target in downstream crates to enable
adding custom code per-target.

cc rust-lang#125803
@rustbot
Copy link
Collaborator

rustbot commented Jun 1, 2024

r? @ehuss

rustbot has assigned @ehuss.
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

@rustbot
Copy link
Collaborator

rustbot commented Jun 1, 2024

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

cc @Nilstrieb

These commits modify compiler targets.
(See the Target Tier Policy.)

@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 Jun 1, 2024
@rust-log-analyzer

This comment has been minimized.

@workingjubilee
Copy link
Member

Needs a bless.

@rustbot
Copy link
Collaborator

rustbot commented Jun 1, 2024

Some changes occurred in tests/ui/check-cfg

cc @Urgau

@rust-log-analyzer

This comment has been minimized.

@ehuss
Copy link
Contributor

ehuss commented Jun 1, 2024

r? compiler

@rustbot rustbot assigned fee1-dead and unassigned ehuss Jun 1, 2024
@fee1-dead
Copy link
Member

r? compiler

@rustbot rustbot assigned wesleywiser and unassigned fee1-dead Jun 3, 2024
@alexcrichton
Copy link
Member Author

ping @wesleywiser mind taking a look at this? (and/or I can round up someone else too)

@wesleywiser
Copy link
Member

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jun 12, 2024

📌 Commit d313e7e has been approved by wesleywiser

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 Jun 12, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 12, 2024
…mpiler-errors

Rollup of 8 pull requests

Successful merges:

 - rust-lang#125869 (Add `target_env = "p1"` to the `wasm32-wasip1` target)
 - rust-lang#126019 (Add TODO comment to unsafe env modification)
 - rust-lang#126036 (Migrate `run-make/short-ice` to `rmake`)
 - rust-lang#126276 (Detect pub structs never constructed even though they impl pub trait with assoc constants)
 - rust-lang#126282 (Ensure self-contained linker is only enabled on dev/nightly )
 - rust-lang#126317 (Avoid a bunch of booleans in favor of Result<(), ErrorGuaranteed> as that more robustly proves that an error has been emitted)
 - rust-lang#126324 (Adjust LoongArch64 data layouts for LLVM update)
 - rust-lang#126340 (Fix outdated predacates_of.rs comments)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 7133257 into rust-lang:master Jun 12, 2024
6 checks passed
@rustbot rustbot added this to the 1.81.0 milestone Jun 12, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Jun 12, 2024
Rollup merge of rust-lang#125869 - alexcrichton:add-p1-to-wasi-targets, r=wesleywiser

Add `target_env = "p1"` to the `wasm32-wasip1` target

This commit sets the `target_env` key for the
`wasm32-wasi{,p1,p1-threads}` targets to the string `"p1"`. This mirrors how the `wasm32-wasip2` target has `target_env = "p2"`. The intention of this is to more easily detect each target in downstream crates to enable adding custom code per-target.

cc rust-lang#125803

<!--
If this PR is related to an unstable feature or an otherwise tracked effort,
please link to the relevant tracking issue here. If you don't know of a related
tracking issue or there are none, feel free to ignore this.

This PR will get automatically assigned to a reviewer. In case you would like
a specific user to review your work, you can assign it to them by using

    r​? <reviewer name>
-->
@alexcrichton alexcrichton deleted the add-p1-to-wasi-targets branch June 24, 2024 19:39
@workingjubilee workingjubilee added the O-wasm Target: WASM (WebAssembly), http://webassembly.org/ label Jul 14, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
O-wasm Target: WASM (WebAssembly), http://webassembly.org/ S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. 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.

8 participants