rustc_target: introduce Abi, Env, Os #148531

tamird · 2025-11-05T15:04:28Z

Improve type safety by using an enum rather than strings.

I'm not really sure this is better since only a few vendors have special semantics. r? @nnethercote

rustbot · 2025-11-05T15:04:31Z

Some changes occurred in compiler/rustc_codegen_cranelift

cc @bjorn3

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

Some changes occurred in compiler/rustc_codegen_ssa

cc @WaffleLapkin

Some changes occurred in cfg and check-cfg configuration

cc @Urgau

The Miri subtree was changed

cc @rust-lang/miri

RalfJung · 2025-11-05T15:26:41Z

FWIW for a related change recently we had quite a bit of discussion: rust-lang/compiler-team#926.

nnethercote

I have a bunch of nits but this generally looks good. Linker is another candidate for enum-ification, if you aren't yet bored of this stuff :)

View changes since this review

compiler/rustc_target/src/spec/mod.rs

nnethercote · 2025-11-06T22:10:03Z

compiler/rustc_target/src/spec/mod.rs

+        Unikraft = "unikraft",
+        Uwp = "uwp",
+        Vex = "vex",
+        Win7 = "win7",


Any idea what "win7" is? Makes me think of Windows 7, which is a weird name for a vendor.

Dates back to #118150 which explains:

I went with naming the target x86_64-win7-windows-msvc, inserting the win7 in the vendor field (usually set to to pc). This is done to avoid ecosystem churn, as quite a few crates have cfg(target_os = "windows") or cfg(target_env = "msvc"), but nearly no cfg(target_vendor = "pc"). Since my goal is to be able to seamlessly swap to the win7 target, I figured it'd be easier this way.

Ugh, ok. Thanks for the info!

compiler/rustc_target/src/spec/mod.rs

compiler/rustc_codegen_cranelift/src/lib.rs

compiler/rustc_target/src/spec/base/apple/mod.rs

compiler/rustc_target/src/spec/mod.rs

compiler/rustc_codegen_cranelift/src/lib.rs

compiler/rustc_target/src/spec/mod.rs

nnethercote · 2025-11-07T02:03:56Z

FWIW for a related change recently we had quite a bit of discussion: rust-lang/compiler-team#926.

IMO these changes are so similar to the change in that MCP that additional discussion isn't needed.

tamird

Addressed all but one comment and left things unsquashed to (somewhat) ease review. I do plan to squash once you're happy with it.

View changes since this review

compiler/rustc_codegen_cranelift/src/lib.rs

compiler/rustc_target/src/spec/base/apple/mod.rs

compiler/rustc_target/src/spec/mod.rs

compiler/rustc_codegen_cranelift/src/lib.rs

tamird · 2025-11-07T03:47:40Z

compiler/rustc_target/src/spec/mod.rs

+        Unikraft = "unikraft",
+        Uwp = "uwp",
+        Vex = "vex",
+        Win7 = "win7",


Dates back to #118150 which explains:

I went with naming the target x86_64-win7-windows-msvc, inserting the win7 in the vendor field (usually set to to pc). This is done to avoid ecosystem churn, as quite a few crates have cfg(target_os = "windows") or cfg(target_env = "msvc"), but nearly no cfg(target_vendor = "pc"). Since my goal is to be able to seamlessly swap to the win7 target, I figured it'd be easier this way.

compiler/rustc_target/src/spec/mod.rs

compiler/rustc_target/src/lib.rs

nnethercote · 2025-11-07T06:05:27Z

r=me with the commits squashed, thanks!

@bors delegate=tamird

bors · 2025-11-07T06:05:30Z

✌️ @tamird, you can now approve this pull request!

If @nnethercote told you to "r=me" after making some further change, please make that change, then do @bors r=@nnethercote

tamird · 2025-11-07T12:07:56Z

range-diff is ~empty, which is what I expected!

@bors r=@nnethercote

bors · 2025-11-07T12:07:59Z

📌 Commit cd47df7 has been approved by nnethercote

It is now in the queue for this repository.

nnethercote · 2025-11-09T20:58:14Z

@tamird: looks like you are planning to merge #148760 before this, and then adjust this accordingly? I give you a gold star for flexibility. It's annoying to do a nice refactoring cleanup that follows the contours of the existing code and then be told that the existing code shouldn't exist. ⭐

tamird · 2025-11-09T20:59:41Z

@tamird: looks like you are planning to merge #148760 before this, and then adjust this accordingly? I give you a gold star for flexibility. It's annoying to do a nice refactoring cleanup that follows the contours of the existing code and then be told that the existing code shouldn't exist. ⭐

Annoying is a crucial part of doing OSS :)

madsmtm · 2025-11-09T21:01:56Z

Yeah, I didn't mean anything rude by it, I do appreciate the work you're doing here!

rustc_target: hide TargetOptions::vendor Discussed in rust-lang#148531 (comment). r? `@bjorn3`

rustc_target: hide TargetOptions::vendor Discussed in rust-lang#148531 (comment). r? ``@bjorn3``

rustc_target: hide TargetOptions::vendor Discussed in rust-lang#148531 (comment). r? ```@bjorn3```

rustc_target: hide TargetOptions::vendor Discussed in rust-lang#148531 (comment). r? ````@bjorn3````

rustc_target: hide TargetOptions::vendor Discussed in rust-lang#148531 (comment). r? `````@bjorn3`````

Rollup merge of #148760 - tamird:avoid-vendor-logic, r=madsmtm rustc_target: hide TargetOptions::vendor Discussed in #148531 (comment). r? `````@bjorn3`````

bors · 2025-11-11T16:52:10Z

☔ The latest upstream changes (presumably #148818) made this pull request unmergeable. Please resolve the merge conflicts.

Avoid duplicating this comment in preparation for adding more enums.

Prepare for additional enums like Vendor and Os which have true `Unknown` variants. We want to use the same name for the escape hatch for all of these, thus rename this one.

Improve type safety by using an enum rather than strings.

rustbot · 2025-11-12T00:33:45Z

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.

tamird · 2025-11-12T00:48:38Z

@bors r=@nnethercote

bors · 2025-11-12T00:48:41Z

📌 Commit 98a534e has been approved by nnethercote

It is now in the queue for this repository.

rustc_target: introduce Abi, Env, Os Improve type safety by using an enum rather than strings. I'm not really sure this is better since only a few vendors have special semantics. r? `@nnethercote`

rustc_target: introduce Abi, Env, Os Improve type safety by using an enum rather than strings. I'm not really sure this is better since only a few vendors have special semantics. r? ``@nnethercote``

Rollup of 16 pull requests Successful merges: - #146627 (Simplify `jemalloc` setup) - #147753 (Suggest add bounding value for RangeTo) - #147832 (rustdoc: Don't pass `RenderOptions` to `DocContext`) - #147974 (Improve diagnostics for buffer reuse with borrowed references) - #148080 ([rustdoc] Fix invalid jump to def macro link generation) - #148465 (Adjust spans into the `for` loops context before creating the new desugaring spans.) - #148500 (Update git index before running diff-index) - #148531 (rustc_target: introduce Abi, Env, Os) - #148536 (cmse: add test for `async` and `const` functions) - #148770 (implement `feature(c_variadic_naked_functions)`) - #148780 (fix filecheck typos in tests) - #148819 (Remove specialized warning for removed target) - #148830 (miri subtree update) - #148833 (Update rustbook dependencies) - #148834 (fix(rustdoc): Color doctest errors) - #148841 (Remove more `#[must_use]` from portable-simd) r? `@ghost` `@rustbot` modify labels: rollup

rustbot added O-apple Operating system: Apple (macOS, iOS, tvOS, visionOS, watchOS) 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 Nov 5, 2025

rustbot assigned nnethercote Nov 5, 2025

tamird force-pushed the vendor-enum branch 2 times, most recently from e47f7c3 to 013077b Compare November 6, 2025 03:08

rustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. labels Nov 6, 2025

This comment has been minimized.

Sign in to view

tamird changed the title ~~rustc_target: introduce Vendor~~ rustc_target: introduce Vendor, Abi, Env, Os Nov 6, 2025

tamird changed the title ~~rustc_target: introduce Vendor, Abi, Env, Os~~ rustc_target: introduce Vendor, ABI, Env, OS Nov 6, 2025

tamird force-pushed the vendor-enum branch from 013077b to 0e0c808 Compare November 6, 2025 03:39

This comment has been minimized.

Sign in to view

tamird force-pushed the vendor-enum branch from 0e0c808 to dbd3aa2 Compare November 6, 2025 08:14

nnethercote requested changes Nov 7, 2025

View reviewed changes

rustbot 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 Nov 7, 2025

tamird force-pushed the vendor-enum branch from dbd3aa2 to 367f96e Compare November 7, 2025 04:03

tamird commented Nov 7, 2025

View reviewed changes

tamird changed the title ~~rustc_target: introduce Vendor, ABI, Env, OS~~ rustc_target: introduce Vendor, Abi, Env, Os Nov 7, 2025

nnethercote reviewed Nov 7, 2025

View reviewed changes

compiler/rustc_target/src/lib.rs Outdated Show resolved Hide resolved

tamird force-pushed the vendor-enum branch from 1bf1227 to cd47df7 Compare November 7, 2025 12:06

This comment has been minimized.

Sign in to view

madsmtm mentioned this pull request Nov 9, 2025

rustc_target: hide TargetOptions::vendor #148760

Merged

Zalathar added a commit to Zalathar/rust that referenced this pull request Nov 10, 2025

Rollup merge of rust-lang#148760 - tamird:avoid-vendor-logic, r=madsmtm

09dba77

rustc_target: hide TargetOptions::vendor Discussed in rust-lang#148531 (comment). r? `@bjorn3`

Zalathar added a commit to Zalathar/rust that referenced this pull request Nov 10, 2025

Rollup merge of rust-lang#148760 - tamird:avoid-vendor-logic, r=madsmtm

abd2deb

rustc_target: hide TargetOptions::vendor Discussed in rust-lang#148531 (comment). r? ``@bjorn3``

ChrisDenton added a commit to ChrisDenton/rust that referenced this pull request Nov 10, 2025

Rollup merge of rust-lang#148760 - tamird:avoid-vendor-logic, r=madsmtm

9eff3af

rustc_target: hide TargetOptions::vendor Discussed in rust-lang#148531 (comment). r? ``@bjorn3``

ChrisDenton added a commit to ChrisDenton/rust that referenced this pull request Nov 10, 2025

Rollup merge of rust-lang#148760 - tamird:avoid-vendor-logic, r=madsmtm

abf6082

rustc_target: hide TargetOptions::vendor Discussed in rust-lang#148531 (comment). r? ```@bjorn3```

Zalathar added a commit to Zalathar/rust that referenced this pull request Nov 11, 2025

Rollup merge of rust-lang#148760 - tamird:avoid-vendor-logic, r=madsmtm

95aa7e1

rustc_target: hide TargetOptions::vendor Discussed in rust-lang#148531 (comment). r? ````@bjorn3````

Zalathar added a commit to Zalathar/rust that referenced this pull request Nov 11, 2025

Rollup merge of rust-lang#148760 - tamird:avoid-vendor-logic, r=madsmtm

d738f03

rustc_target: hide TargetOptions::vendor Discussed in rust-lang#148531 (comment). r? `````@bjorn3`````

rust-timer added a commit that referenced this pull request Nov 11, 2025

Unrolled build for #148760

fb684b3

Rollup merge of #148760 - tamird:avoid-vendor-logic, r=madsmtm rustc_target: hide TargetOptions::vendor Discussed in #148531 (comment). r? `````@bjorn3`````

tamird added 7 commits November 11, 2025 16:47

rustc_target: move comment to macro

c6f924c

Avoid duplicating this comment in preparation for adding more enums.

rustc_target: rename Arch::{Uknown,Other}

a1122a1

Prepare for additional enums like Vendor and Os which have true `Unknown` variants. We want to use the same name for the escape hatch for all of these, thus rename this one.

rustc_target: introduce Abi

86c74a4

Improve type safety by using an enum rather than strings.

rustc_target: introduce Env

ddd7596

Improve type safety by using an enum rather than strings.

rustc_target: introduce Os

fcf6809

Improve type safety by using an enum rather than strings.

rustc_target: rehome target_abi comment

19e26af

rustc_codegen_ssa: reduce repetition

98a534e

tamird changed the title ~~rustc_target: introduce Vendor, Abi, Env, Os~~ rustc_target: introduce Abi, Env, Os Nov 12, 2025

tamird force-pushed the vendor-enum branch from 6b87b87 to 98a534e Compare November 12, 2025 00:33

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 12, 2025

Zalathar mentioned this pull request Nov 12, 2025

Rollup of 16 pull requests #148851

Open

rustc_target: introduce Abi, Env, Os #148531

Are you sure you want to change the base?

rustc_target: introduce Abi, Env, Os #148531

Conversation

tamird commented Nov 5, 2025

Uh oh!

rustbot commented Nov 5, 2025

Uh oh!

RalfJung commented Nov 5, 2025

Uh oh!

This comment has been minimized.

This comment has been minimized.

nnethercote left a comment • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

nnethercote Nov 6, 2025

Choose a reason for hiding this comment

Uh oh!

tamird Nov 7, 2025

Choose a reason for hiding this comment

Uh oh!

nnethercote Nov 7, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

nnethercote commented Nov 7, 2025

Uh oh!

tamird left a comment • edited by rustbot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

tamird Nov 7, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

nnethercote commented Nov 7, 2025

Uh oh!

bors commented Nov 7, 2025

Uh oh!

This comment has been minimized.

tamird commented Nov 7, 2025

Uh oh!

bors commented Nov 7, 2025

Uh oh!

nnethercote commented Nov 9, 2025

Uh oh!

tamird commented Nov 9, 2025

Uh oh!

madsmtm commented Nov 9, 2025

Uh oh!

bors commented Nov 11, 2025

Uh oh!

rustbot commented Nov 12, 2025

Uh oh!

tamird commented Nov 12, 2025

Uh oh!

bors commented Nov 12, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

nnethercote left a comment •

edited by rustbot

Loading

tamird left a comment •

edited by rustbot

Loading