compiler: Clean up weird rustc_abi reexports
#136565
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
r? @chenyukang rustbot has assigned @chenyukang. Use |
rustbot
added
S-waiting-on-review
|
These commits modify compiler targets. |
I mean, they really kinda don't. |
workingjubilee
force-pushed
the
fixup-abi-in-target
branch
3 times, most recently
from
95fa4b9 to
d2346b9
Compare
|
Kept finding small additional fixups during self-review... done now. |
lqd
reviewed
Feb 5, 2025
workingjubilee
force-pushed
the
fixup-abi-in-target
branch
from
d2346b9 to
9149e0e
Compare
workingjubilee
commented
Feb 5, 2025
Comment on lines
33
to
37
| pub mod abi { | ||
| pub(crate) use Float::*; | ||
| pub(crate) use Primitive::*; | ||
| // Explicitly import `Float` to avoid ambiguity with `Primitive::Float`. | ||
| pub use rustc_abi::{Float, *}; | ||
| pub use rustc_abi::*; | ||
|
|
||
| pub use crate::callconv as call; | ||
| } |
There was a problem hiding this comment.
I have a few diffs which can remove this entirely but they make for a tree-wide diff as a result (and I have been generally trying to minimize things which may require huge rebases, or at least trying to land the smaller changes first).
compiler-errors
approved these changes
Feb 5, 2025
|
lgtm @bors r+ rollup |
bors
added
S-waiting-on-bors
This was referenced Feb 5, 2025
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Feb 6, 2025
…kingjubilee Rollup of 13 pull requests Successful merges: - rust-lang#133932 (Avoid using make_direct_deprecated() in extern "ptx-kernel") - rust-lang#136269 (Pass spans around new solver) - rust-lang#136550 (Fix `rustc_hidden_type_of_opaques` for RPITITs with no default body) - rust-lang#136558 (Document minimum supported host tooling on macOS) - rust-lang#136563 (Clean up `Trivial*Impls` macros) - rust-lang#136566 (Fix link in from_fn.rs) - rust-lang#136573 (Document why some "type mismatches" exist) - rust-lang#136583 (Only highlight unmatchable parameters at the definition site) - rust-lang#136587 (Update browser-ui-test version to `0.20.2`) - rust-lang#136590 (Implement RustcInternal for RawPtrKind) - rust-lang#136591 (Add `rustc_hir_pretty::expr_to_string` function) - rust-lang#136595 (Fix `unreachable_pub` lint for hermit target) - rust-lang#136611 (cg_llvm: Remove the `mod llvm_` hack, which should no longer be necessary) Failed merges: - rust-lang#136565 (compiler: Clean up weird `rustc_abi` reexports) r? `@ghost` `@rustbot` modify labels: rollup
workingjubilee
force-pushed
the
fixup-abi-in-target
branch
from
9149e0e to
4c46761
Compare
rustc_target has had a lot of weird reexports for various reasons, but now we're at a point where we can actually start reducing their number. We remove weird shadowing-dependent behavior and import directly from rustc_abi instead of doing weird renaming imports. This is only incremental progress and does not entirely fix the crate.
General housekeeping: - Use less reexports from its rustc_target era - Unify some imports as a result - Split the Reg(ister) types into their own files Generally moving stuff around because it makes the crate more consistent.
workingjubilee
force-pushed
the
fixup-abi-in-target
branch
2 times, most recently
from
4a1fff1 to
28140e8
Compare
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Feb 6, 2025
…, r=compiler-errors compiler: Clean up weird `rustc_abi` reexports Just general cleanup in `rustc_target` and `rustc_abi`. I was originally going to make a PR with a larger change that also fixed the last few crates and in doing so removed some clutter from `rustc_abi`, but wound up slightly stuck on it, then figured out how to fix it, and then got distracted by other things... so now I'm trying to figure out what I had figured out earlier.
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Feb 7, 2025
…iaskrgr Rollup of 9 pull requests Successful merges: - rust-lang#135973 (fix tail call checks wrt `#[track_caller]`) - rust-lang#136191 (compiler: replace few consts arrays with statics to remove const dupes) - rust-lang#136565 (compiler: Clean up weird `rustc_abi` reexports) - rust-lang#136582 (Revert "CI: build FreeBSD artifacts on FreeBSD 13.4") - rust-lang#136592 (Make sure we don't overrun the stack in canonicalizer) - rust-lang#136627 (MIR validation: add comment explaining the limitations of CfgChecker) - rust-lang#136634 (Stabilise `Cursor::{get_mut, set_position}` in `const` scenarios.) - rust-lang#136643 (ping me for attribute-related changes) - rust-lang#136644 (Add `rustc_hir_pretty::item_to_string` function) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Feb 7, 2025
…iaskrgr Rollup of 8 pull requests Successful merges: - rust-lang#135973 (fix tail call checks wrt `#[track_caller]`) - rust-lang#136191 (compiler: replace few consts arrays with statics to remove const dupes) - rust-lang#136565 (compiler: Clean up weird `rustc_abi` reexports) - rust-lang#136582 (Revert "CI: build FreeBSD artifacts on FreeBSD 13.4") - rust-lang#136627 (MIR validation: add comment explaining the limitations of CfgChecker) - rust-lang#136634 (Stabilise `Cursor::{get_mut, set_position}` in `const` scenarios.) - rust-lang#136643 (ping me for attribute-related changes) - rust-lang#136644 (Add `rustc_hir_pretty::item_to_string` function) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Feb 7, 2025
Rollup merge of rust-lang#136565 - workingjubilee:fixup-abi-in-target, r=compiler-errors compiler: Clean up weird `rustc_abi` reexports Just general cleanup in `rustc_target` and `rustc_abi`. I was originally going to make a PR with a larger change that also fixed the last few crates and in doing so removed some clutter from `rustc_abi`, but wound up slightly stuck on it, then figured out how to fix it, and then got distracted by other things... so now I'm trying to figure out what I had figured out earlier.
github-actions bot
pushed a commit
to tautschnig/verify-rust-std
that referenced
this pull request
Mar 11, 2025
…kingjubilee Rollup of 13 pull requests Successful merges: - rust-lang#133932 (Avoid using make_direct_deprecated() in extern "ptx-kernel") - rust-lang#136269 (Pass spans around new solver) - rust-lang#136550 (Fix `rustc_hidden_type_of_opaques` for RPITITs with no default body) - rust-lang#136558 (Document minimum supported host tooling on macOS) - rust-lang#136563 (Clean up `Trivial*Impls` macros) - rust-lang#136566 (Fix link in from_fn.rs) - rust-lang#136573 (Document why some "type mismatches" exist) - rust-lang#136583 (Only highlight unmatchable parameters at the definition site) - rust-lang#136587 (Update browser-ui-test version to `0.20.2`) - rust-lang#136590 (Implement RustcInternal for RawPtrKind) - rust-lang#136591 (Add `rustc_hir_pretty::expr_to_string` function) - rust-lang#136595 (Fix `unreachable_pub` lint for hermit target) - rust-lang#136611 (cg_llvm: Remove the `mod llvm_` hack, which should no longer be necessary) Failed merges: - rust-lang#136565 (compiler: Clean up weird `rustc_abi` reexports) r? `@ghost` `@rustbot` modify labels: rollup
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Just general cleanup in
rustc_targetandrustc_abi. I was originally going to make a PR with a larger change that also fixed the last few crates and in doing so removed some clutter fromrustc_abi, but wound up slightly stuck on it, then figured out how to fix it, and then got distracted by other things... so now I'm trying to figure out what I had figured out earlier.