compiler: Move `rustc_target::spec::abi::Abi` to `rustc_abi::ExternAbi` #132385

workingjubilee · 2024-10-31T05:36:19Z

Lift enum Abi from its rather odd place in the middle of rustc_target, and make it available again from rustc_abi. You know, the crate where you would expect the enum that describes all the ABIs to be? The platform-neutral ones, at least. This will help further refactoring of how we handle ABIs in the near future¹.

Rename Abi to ExternAbi because quite a lot of the compiler overloads the concept of "ABI" enough that the existing name is imprecise and it is often renamed anyway. Often this was to avoid conflicts with the other type formerly known as Abi (now named BackendRepr²), but sometimes it is just for clarity, and this name seems more self-explanatory. It does get reexported, though, using its old name, to reduce the odds of merge-conflicting over the entire tree.

All of ExternAbi's friends come along for the ride, which costs adding some optional dependencies to the rustc_abi crate. However, all of this also allows simply moving three crates entirely off rustc_target:

rustc_hir_pretty
rustc_lint_defs
rustc_mir_build

This odd selection is mostly to demonstrate a secondary motivation: The majority of the front-end of the compiler should be as target-agnostic as possible, and it is easier to assure this if they simply don't depend on the crate that describes targets. Note that I didn't migrate crates that don't benefit from it in this way yet, and I didn't survey every last crate.

This is being undertaken as part of https://github.com/rust-lang/rust/issues/119183 ↩
https://github.com/rust-lang/rust/pull/132246 ↩

rustbot · 2024-10-31T05:36:27Z

r? @pnkfelix

rustbot has assigned @pnkfelix.
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 · 2024-10-31T05:36:29Z

Some changes occurred in match checking

cc @Nadrieril

Some changes occurred in match lowering

cc @Nadrieril

These commits modify the Cargo.lock file. Unintentional changes to Cargo.lock can be introduced when switching branches and rebasing PRs.

If this was unintentional then you should revert the changes before this PR is merged.
Otherwise, you can ignore this comment.

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

Completely abandon usage of rustc_target in these crates, as they need no special knowledge of rustc's target tuples.

jieyouxu

Looks certainly saner to me. Will wait a bit in case anyone has some naming/terminology concerns, but otherwise LGTM.

compiler-errors · 2024-10-31T15:07:20Z

compiler/rustc_abi/src/extern_abi/mod.rs

@@ -7,9 +7,11 @@ use rustc_span::{Span, Symbol};
 #[cfg(test)]
 mod tests;

+use ExternAbi as Abi;


are we gonna get rid of this too

compiler-errors

👍 👍. No naming concerns from me.

compiler-errors · 2024-10-31T15:07:46Z

compiler/rustc_target/src/spec/mod.rs

 pub mod crt_objects;

+pub mod abi {
+    pub use rustc_abi::{


and this reexport as Abi would be nice to get rid of

I can make this PR my entry in the most-files-in-tree-diffed-in-2024 competition, sure.

compiler-errors · 2024-10-31T17:19:12Z

Let's not do any more cleanups in this PR. I'm happy to review anything re: those comments I left above, possibly piecewise.

@bors r=jieyouxu,compiler-errors

bors · 2024-10-31T17:19:15Z

📌 Commit 8a0e640 has been approved by jieyouxu,compiler-errors

It is now in the queue for this repository.

…bi, r=jieyouxu,compiler-errors compiler: Move `rustc_target::spec::abi::Abi` to `rustc_abi::ExternAbi` Lift `enum Abi` from its rather odd place in the middle of rustc_target, and make it available again from rustc_abi. You know, the crate where you would expect the enum that describes all the ABIs to be? The platform-neutral ones, at least. This will help further refactoring of how we handle ABIs in the near future[^0]. Rename `Abi` to `ExternAbi` because quite a lot of the compiler overloads the concept of "ABI" enough that the existing name is imprecise and it is often renamed _anyway_. Often this was to avoid conflicts with the *other* type formerly known as `Abi` (now named BackendRepr[^1]), but sometimes it is just for clarity, and this name seems more self-explanatory. It does get reexported, though, using its old name, to reduce the odds of merge-conflicting over the entire tree. All of `ExternAbi`'s friends come along for the ride, which costs adding some optional dependencies to the rustc_abi crate. However, all of this also allows simply moving three crates entirely off rustc_target: - rustc_hir_pretty - rustc_lint_defs - rustc_mir_build This odd selection is mostly to demonstrate a secondary motivation: The majority of the front-end of the compiler should be as target-agnostic as possible, and it is easier to assure this if they simply don't depend on the crate that describes targets. Note that I didn't migrate crates that don't benefit from it in this way yet, and I didn't survey every last crate. [^0]: This is being undertaken as part of rust-lang#119183 [^1]: rust-lang#132246

…iaskrgr Rollup of 5 pull requests Successful merges: - rust-lang#131168 (Fix `target_os` for `mipsel-sony-psx`) - rust-lang#132209 (Fix validation when lowering `?` trait bounds) - rust-lang#132357 (Improve missing_abi lint) - rust-lang#132385 (compiler: Move `rustc_target::spec::abi::Abi` to `rustc_abi::ExternAbi`) - rust-lang#132417 (macOS: Document the difference between Clang's `-darwin` and `-macosx` targets) r? `@ghost` `@rustbot` modify labels: rollup

…kingjubilee Rollup of 9 pull requests Successful merges: - rust-lang#131168 (Fix `target_os` for `mipsel-sony-psx`) - rust-lang#132209 (Fix validation when lowering `?` trait bounds) - rust-lang#132294 (Bump Fuchsia) - rust-lang#132357 (Improve missing_abi lint) - rust-lang#132385 (compiler: Move `rustc_target::spec::abi::Abi` to `rustc_abi::ExternAbi`) - rust-lang#132403 (continue `TypingMode` refactor) - rust-lang#132417 (macOS: Document the difference between Clang's `-darwin` and `-macosx` targets) - rust-lang#132421 (Remove `""` case from RISC-V `llvm_abiname` match statement) - rust-lang#132422 (llvm: Match new LLVM 128-bit integer alignment on sparc) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#132385 - workingjubilee:move-abi-to-rustc-abi, r=jieyouxu,compiler-errors compiler: Move `rustc_target::spec::abi::Abi` to `rustc_abi::ExternAbi` Lift `enum Abi` from its rather odd place in the middle of rustc_target, and make it available again from rustc_abi. You know, the crate where you would expect the enum that describes all the ABIs to be? The platform-neutral ones, at least. This will help further refactoring of how we handle ABIs in the near future[^0]. Rename `Abi` to `ExternAbi` because quite a lot of the compiler overloads the concept of "ABI" enough that the existing name is imprecise and it is often renamed _anyway_. Often this was to avoid conflicts with the *other* type formerly known as `Abi` (now named BackendRepr[^1]), but sometimes it is just for clarity, and this name seems more self-explanatory. It does get reexported, though, using its old name, to reduce the odds of merge-conflicting over the entire tree. All of `ExternAbi`'s friends come along for the ride, which costs adding some optional dependencies to the rustc_abi crate. However, all of this also allows simply moving three crates entirely off rustc_target: - rustc_hir_pretty - rustc_lint_defs - rustc_mir_build This odd selection is mostly to demonstrate a secondary motivation: The majority of the front-end of the compiler should be as target-agnostic as possible, and it is easier to assure this if they simply don't depend on the crate that describes targets. Note that I didn't migrate crates that don't benefit from it in this way yet, and I didn't survey every last crate. [^0]: This is being undertaken as part of rust-lang#119183 [^1]: rust-lang#132246

rustbot assigned pnkfelix Oct 31, 2024

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 31, 2024

workingjubilee added 2 commits October 30, 2024 22:38

compiler: Lift rustc_target::spec::abi::Abi to rustc_abi::ExternAbi

eca1702

compiler: Switch to rustc_abi in hir_pretty, lint_defs, and mir_build

8a0e640

Completely abandon usage of rustc_target in these crates, as they need no special knowledge of rustc's target tuples.

workingjubilee force-pushed the move-abi-to-rustc-abi branch from 7d62e93 to 8a0e640 Compare October 31, 2024 05:40

workingjubilee mentioned this pull request Oct 31, 2024

Tracking issue for refactoring the way we represent function call ABIs #119183

Open

19 tasks

jieyouxu approved these changes Oct 31, 2024

View reviewed changes

compiler-errors reviewed Oct 31, 2024

View reviewed changes

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 Oct 31, 2024

matthiaskrgr mentioned this pull request Oct 31, 2024

Rollup of 5 pull requests #132420

Closed

workingjubilee mentioned this pull request Nov 1, 2024

Rollup of 9 pull requests #132435

Merged

bors merged commit 6da4221 into rust-lang:master Nov 1, 2024
6 checks passed

rustbot added this to the 1.84.0 milestone Nov 1, 2024

workingjubilee deleted the move-abi-to-rustc-abi branch November 2, 2024 19:41

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

compiler: Move `rustc_target::spec::abi::Abi` to `rustc_abi::ExternAbi` #132385

compiler: Move `rustc_target::spec::abi::Abi` to `rustc_abi::ExternAbi` #132385

workingjubilee commented Oct 31, 2024 •

edited

Loading

rustbot commented Oct 31, 2024

rustbot commented Oct 31, 2024

jieyouxu left a comment

compiler-errors Oct 31, 2024

compiler-errors left a comment

compiler-errors Oct 31, 2024

workingjubilee Oct 31, 2024

compiler-errors commented Oct 31, 2024

bors commented Oct 31, 2024

compiler: Move rustc_target::spec::abi::Abi to rustc_abi::ExternAbi #132385

compiler: Move rustc_target::spec::abi::Abi to rustc_abi::ExternAbi #132385

Conversation

workingjubilee commented Oct 31, 2024 • edited Loading

Footnotes

rustbot commented Oct 31, 2024

rustbot commented Oct 31, 2024

jieyouxu left a comment

Choose a reason for hiding this comment

compiler-errors Oct 31, 2024

Choose a reason for hiding this comment

compiler-errors left a comment

Choose a reason for hiding this comment

compiler-errors Oct 31, 2024

Choose a reason for hiding this comment

workingjubilee Oct 31, 2024

Choose a reason for hiding this comment

compiler-errors commented Oct 31, 2024

bors commented Oct 31, 2024

compiler: Move `rustc_target::spec::abi::Abi` to `rustc_abi::ExternAbi` #132385

compiler: Move `rustc_target::spec::abi::Abi` to `rustc_abi::ExternAbi` #132385

workingjubilee commented Oct 31, 2024 •

edited

Loading