compiler: Stop reexporting enum-globs from `rustc_target::abi` #131424

workingjubilee · 2024-10-09T01:18:36Z

Three enums had all their variants glob-exported into a distressingly large amount of the tree. Cease to do that, and also cease to glob import the contents of the module that contained them. Redirect relevant imports to their actual source, the rustc_abi crate.

No functional changes.

rustbot · 2024-10-09T01:18:43Z

r? @chenyukang

rustbot has assigned @chenyukang.
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-09T01:18:45Z

Some changes occurred to the CTFE / Miri interpreter

cc @rust-lang/miri

Some changes occurred in compiler/rustc_codegen_cranelift

cc @bjorn3

Some changes occurred in compiler/rustc_codegen_gcc

cc @antoyo, @GuillaumeGomez

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.

jieyouxu

Thank you, I have found this very confusing in the past. You can r=me after PR CI is green.

workingjubilee · 2024-10-09T01:26:57Z

Almost forgot one.

workingjubilee

After this, some of these types will be possible to separate out of rustc_target, but only if we stop having absolutely everything depend on this bizarre triple-nested reexport structure.

workingjubilee · 2024-10-09T01:36:40Z

compiler/rustc_codegen_gcc/src/type_of.rs

 use rustc_codegen_ssa::traits::{
    BaseTypeCodegenMethods, DerivedTypeCodegenMethods, LayoutTypeCodegenMethods,
 };
 use rustc_middle::bug;
 use rustc_middle::ty::layout::{LayoutOf, TyAndLayout};
 use rustc_middle::ty::print::with_no_trimmed_paths;
 use rustc_middle::ty::{self, CoroutineArgsExt, Ty, TypeVisitableExt};
+use rustc_target::abi::TyAbiInterface;


workingjubilee · 2024-10-09T01:38:20Z

compiler/rustc_ty_utils/src/layout.rs

@@ -18,8 +23,9 @@ use rustc_middle::ty::{
 use rustc_session::{DataTypeKind, FieldInfo, FieldKind, SizeKind, VariantInfo};
 use rustc_span::sym;
 use rustc_span::symbol::Symbol;
-use rustc_target::abi::*;
+use rustc_target::abi::{FIRST_VARIANT, FieldIdx, Layout, VariantIdx};


...and these are the reason I bothered.

Hmm, factoring these out will also be a bit of a pain. Ah well, will worry about it later.

workingjubilee · 2024-10-09T02:55:20Z

@bors r=jieyouxu rollup

bors · 2024-10-09T02:55:22Z

📌 Commit 43e198a has been approved by jieyouxu

It is now in the queue for this repository.

…ob-imports, r=jieyouxu compiler: Stop reexporting enum-globs from `rustc_target::abi` Three enums had **all** their variants glob-exported into a distressingly large amount of the tree. Cease to do that, and also cease to glob import the contents of the module that contained them. Redirect relevant imports to their actual source, the `rustc_abi` crate. No functional changes.

…kingjubilee Rollup of 4 pull requests Successful merges: - rust-lang#129424 (Stabilize `Pin::as_deref_mut()`) - rust-lang#131417 (Fix methods alignment on mobile) - rust-lang#131424 (compiler: Stop reexporting enum-globs from `rustc_target::abi`) - rust-lang#131426 (Fix quotation marks around debug line in `src/ci/run.sh`) r? `@ghost` `@rustbot` modify labels: rollup

…ob-imports, r=jieyouxu compiler: Stop reexporting enum-globs from `rustc_target::abi` Three enums had **all** their variants glob-exported into a distressingly large amount of the tree. Cease to do that, and also cease to glob import the contents of the module that contained them. Redirect relevant imports to their actual source, the `rustc_abi` crate. No functional changes.

…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#129424 (Stabilize `Pin::as_deref_mut()`) - rust-lang#131417 (Fix methods alignment on mobile) - rust-lang#131424 (compiler: Stop reexporting enum-globs from `rustc_target::abi`) - rust-lang#131426 (Fix quotation marks around debug line in `src/ci/run.sh`) - rust-lang#131429 (Rename directive `needs-profiler-support` to `needs-profiler-runtime`) - rust-lang#131435 (Ignore broken-pipe-no-ice on apple (specifically macOS) for now) r? `@ghost` `@rustbot` modify labels: rollup

…kingjubilee Rollup of 4 pull requests Successful merges: - rust-lang#129424 (Stabilize `Pin::as_deref_mut()`) - rust-lang#131417 (Fix methods alignment on mobile) - rust-lang#131424 (compiler: Stop reexporting enum-globs from `rustc_target::abi`) - rust-lang#131426 (Fix quotation marks around debug line in `src/ci/run.sh`) r? `@ghost` `@rustbot` modify labels: rollup

…ob-imports, r=jieyouxu compiler: Stop reexporting enum-globs from `rustc_target::abi` Three enums had **all** their variants glob-exported into a distressingly large amount of the tree. Cease to do that, and also cease to glob import the contents of the module that contained them. Redirect relevant imports to their actual source, the `rustc_abi` crate. No functional changes.

Rollup of 6 pull requests Successful merges: - rust-lang#131417 (Fix methods alignment on mobile) - rust-lang#131420 (Dont ICE when encountering post-mono layout cycle error) - rust-lang#131424 (compiler: Stop reexporting enum-globs from `rustc_target::abi`) - rust-lang#131426 (Fix quotation marks around debug line in `src/ci/run.sh`) - rust-lang#131429 (Rename directive `needs-profiler-support` to `needs-profiler-runtime`) - rust-lang#131435 (Ignore broken-pipe-no-ice on apple (specifically macOS) for now) r? `@ghost` `@rustbot` modify labels: rollup

…iaskrgr Rollup of 7 pull requests Successful merges: - rust-lang#131382 (Add "reference" as a known compiletest header) - rust-lang#131420 (Dont ICE when encountering post-mono layout cycle error) - rust-lang#131424 (compiler: Stop reexporting enum-globs from `rustc_target::abi`) - rust-lang#131426 (Fix quotation marks around debug line in `src/ci/run.sh`) - rust-lang#131435 (Ignore broken-pipe-no-ice on apple (specifically macOS) for now) - rust-lang#131447 (add more crash tests) - rust-lang#131456 (Fix typo in E0793) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#131424 - workingjubilee:stem-the-tyde-of-glob-imports, r=jieyouxu compiler: Stop reexporting enum-globs from `rustc_target::abi` Three enums had **all** their variants glob-exported into a distressingly large amount of the tree. Cease to do that, and also cease to glob import the contents of the module that contained them. Redirect relevant imports to their actual source, the `rustc_abi` crate. No functional changes.

compiler: Factor rustc_target::abi::* out of middle::ty::layout

8da92b5

rustbot assigned chenyukang Oct 9, 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 9, 2024

jieyouxu approved these changes Oct 9, 2024

View reviewed changes

jieyouxu assigned jieyouxu and unassigned chenyukang Oct 9, 2024

workingjubilee added 8 commits October 8, 2024 18:24

compiler: Factor rustc_target::abi::* out of ty_utils

11c48be

compiler: Factor rustc_target::abi out of const_eval

9d95c8b

compiler: Factor rustc_target::abi out of hir_typeck

ff17ce2

compiler: Factor rustc_target::abi out of cg_ssa

839cf1c

compiler: Factor rustc_target::abi out of cg_llvm

1379ef5

cg_clif: Factor out rustc_target::abi

b3beb4e

cg_gcc: Factor out rustc_target::abi

d92aee5

compiler: Seal off the rustc_target::abi enum glob imports

43e198a

workingjubilee force-pushed the stem-the-tyde-of-glob-imports branch from fb67968 to 43e198a Compare October 9, 2024 01:26

workingjubilee commented Oct 9, 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 9, 2024

workingjubilee mentioned this pull request Oct 9, 2024

Rollup of 4 pull requests #131428

Closed

matthiaskrgr mentioned this pull request Oct 9, 2024

Rollup of 6 pull requests #131438

Closed

jieyouxu mentioned this pull request Oct 9, 2024

Rollup of 6 pull requests #131440

Closed

matthiaskrgr mentioned this pull request Oct 9, 2024

Rollup of 7 pull requests #131458

Merged

workingjubilee mentioned this pull request Oct 9, 2024

compiler: {TyAnd,}Layout comes home #131473

Merged

bors merged commit e642442 into rust-lang:master Oct 10, 2024
6 checks passed

rustbot added this to the 1.83.0 milestone Oct 10, 2024

workingjubilee deleted the stem-the-tyde-of-glob-imports branch October 10, 2024 04:04

workingjubilee mentioned this pull request Oct 16, 2024

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

Open

17 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

compiler: Stop reexporting enum-globs from `rustc_target::abi` #131424

compiler: Stop reexporting enum-globs from `rustc_target::abi` #131424

workingjubilee commented Oct 9, 2024

rustbot commented Oct 9, 2024

rustbot commented Oct 9, 2024

jieyouxu left a comment

workingjubilee commented Oct 9, 2024

workingjubilee left a comment

workingjubilee Oct 9, 2024

workingjubilee Oct 9, 2024

workingjubilee Oct 9, 2024

workingjubilee commented Oct 9, 2024

bors commented Oct 9, 2024

compiler: Stop reexporting enum-globs from rustc_target::abi #131424

compiler: Stop reexporting enum-globs from rustc_target::abi #131424

Conversation

workingjubilee commented Oct 9, 2024

rustbot commented Oct 9, 2024

rustbot commented Oct 9, 2024

jieyouxu left a comment

Choose a reason for hiding this comment

workingjubilee commented Oct 9, 2024

workingjubilee left a comment

Choose a reason for hiding this comment

workingjubilee Oct 9, 2024

Choose a reason for hiding this comment

workingjubilee Oct 9, 2024

Choose a reason for hiding this comment

workingjubilee Oct 9, 2024

Choose a reason for hiding this comment

workingjubilee commented Oct 9, 2024

bors commented Oct 9, 2024

compiler: Stop reexporting enum-globs from `rustc_target::abi` #131424

compiler: Stop reexporting enum-globs from `rustc_target::abi` #131424