Skip to content

compiler: Stop reexporting stuff in cg_llvm::abi #137210

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

Merged
merged 1 commit into from
Feb 19, 2025

Conversation

workingjubilee
Copy link
Member

@workingjubilee workingjubilee commented Feb 18, 2025

The reexports confuse tooling like rustdoc into thinking cg_llvm is the source of key types that originate in rustc_target.

Avoids #137209 but does not fix the underlying bug.
r? @RalfJung

The reexports confuse tooling like rustdoc into thinking cg_llvm is
the source of key types that originate in rustc_target.
@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 Feb 18, 2025
@RalfJung
Copy link
Member

These are just pub(crate) re-exports that you are removing here though, right? They are not public, so they should not affect rustdoc.

@workingjubilee
Copy link
Member Author

Correct.

Yes, the bug seems quite bad.

@RalfJung
Copy link
Member

Okay, let's not close the issue then.

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Feb 18, 2025

📌 Commit 2d2de18 has been approved by RalfJung

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 Feb 18, 2025
@workingjubilee
Copy link
Member Author

sounds good to me

use rustc_codegen_ssa::MemFlags;
use rustc_codegen_ssa::mir::operand::{OperandRef, OperandValue};
use rustc_codegen_ssa::mir::place::{PlaceRef, PlaceValue};
use rustc_codegen_ssa::traits::*;
use rustc_middle::ty::Ty;
use rustc_middle::ty::layout::LayoutOf;
pub(crate) use rustc_middle::ty::layout::{WIDE_PTR_ADDR, WIDE_PTR_EXTRA};
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is the funniest diff in this PR, to me, because it was absolutely being reexported here but not actually used here.

@workingjubilee
Copy link
Member Author

@bors rollup

bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 19, 2025
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#136936 (Use 'yes' instead of 'while-echo' in tests/ui/process/process-sigpipe.rs except 'nto')
 - rust-lang#137026 (Stabilize (and const-stabilize) `integer_sign_cast`)
 - rust-lang#137059 (fix: Alloc new errorcode E0803 for E0495)
 - rust-lang#137177 (Update `minifier-rs` version to `0.3.5`)
 - rust-lang#137210 (compiler: Stop reexporting stuff in cg_llvm::abi)
 - rust-lang#137213 (Remove `rustc_middle::mir::tcx` module.)
 - rust-lang#137216 (eval_outlives: bail out early if both regions are in the same SCC)
 - rust-lang#137228 (Fix typo in hidden internal docs of `TrustedRandomAccess`)
 - rust-lang#137242 (Add reference annotations for the `do_not_recommend` attribute)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 2bd65eb into rust-lang:master Feb 19, 2025
6 checks passed
@rustbot rustbot added this to the 1.87.0 milestone Feb 19, 2025
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Feb 19, 2025
Rollup merge of rust-lang#137210 - workingjubilee:fixup-passmode-import, r=RalfJung

compiler: Stop reexporting stuff in cg_llvm::abi

The reexports confuse tooling like rustdoc into thinking cg_llvm is the source of key types that originate in rustc_target.
@workingjubilee workingjubilee deleted the fixup-passmode-import branch February 20, 2025 20:10
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

4 participants