Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Revert "Use workspace lints for crates in compiler/ #138084" #138306

Merged
merged 1 commit into from
Mar 10, 2025
Merged

Revert "Use workspace lints for crates in compiler/ #138084" #138306

merged 1 commit into from
Mar 10, 2025

Conversation

jieyouxu
Copy link
Member

@jieyouxu jieyouxu commented Mar 10, 2025 •
edited
Loading

Revert #138084 to buy time to consider options that avoids breaking downstream usages of cargo on distributed rustc-src artifacts, where such cargo invocations fail due to inability to inherit lints from workspace root manifest's workspace.lints (this is only valid for the source rust-lang/rust workspace, but not really the distributed rustc-src artifacts). The problem is that the rustc-src component doesn't include the root Cargo.toml manifest.

This breakage was reported in #138304.

This reverts commit 48caf81, reversing changes made to c666287.

cc @RalfJung

r? @nnethercote (sorry, I didn't consider this being a thing 💀)

@jieyouxu
Revert "Use workspace lints for crates in compiler/ rust-lang#138084"
063ef18 
Revert <rust-lang#138084> to buy time to
consider options that avoids breaking downstream usages of cargo on
distributed `rustc-src` artifacts, where such cargo invocations fail due
to inability to inherit `lints` from workspace root manifest's
`workspace.lints` (this is only valid for the source rust-lang/rust
workspace, but not really the distributed `rustc-src` artifacts).

This breakage was reported in
<rust-lang#138304>.

This reverts commit 48caf81, reversing
changes made to c666287.
@rustbot rustbot added A-attributes Area: Attributes (`#[…]`, `#![…]`) A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic PG-exploit-mitigations Project group: Exploit mitigations S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Mar 10, 2025
@rustbot
Copy link
Collaborator

rustbot commented Mar 10, 2025

Some changes occurred in diagnostic error codes

cc @GuillaumeGomez

Some changes occurred in compiler/rustc_codegen_ssa

cc @WaffleLapkin

rustc_error_messages was changed

cc @davidtwco, @compiler-errors, @TaKO8Ki

This PR changes Stable MIR

cc @oli-obk, @celinval, @ouz-a

Some changes occurred to the CTFE machinery

cc @RalfJung, @oli-obk, @lcnr

Some changes occurred in compiler/rustc_sanitizers

cc @rust-lang/project-exploit-mitigations, @rcvalle

Some changes occurred in exhaustiveness checking

cc @Nadrieril

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

Some changes occurred in compiler/rustc_attr_parsing

cc @jdonszelmann

Some changes occurred in compiler/rustc_attr_data_structures

cc @jdonszelmann

@jieyouxu jieyouxu mentioned this pull request Mar 10, 2025
Closed
@Noratrieb
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Mar 10, 2025

📌 Commit 063ef18 has been approved by Noratrieb

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 Mar 10, 2025
@matthiaskrgr matthiaskrgr mentioned this pull request Mar 10, 2025
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 10, 2025
@bors
Auto merge of rust-lang#138310 - matthiaskrgr:rollup-zvbpuei, r=matth…
9fb94b3 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#137931 (Add remark for missing `llvm-tools` component re. `rustc_private` linker failures related to not finding LLVM libraries)
 - rust-lang#138138 (Pass `InferCtxt` to `InlineAsmCtxt` to properly taint on error)
 - rust-lang#138223 (Fix post-merge workflow)
 - rust-lang#138268 (Handle empty test suites in GitHub job summary report)
 - rust-lang#138278 (Delegation: fix ICE with invalid `MethodCall` generation)
 - rust-lang#138281 (Fix O(tests) stack usage in edition 2024 mergeable doctests)
 - rust-lang#138305 (Subtree update of `rust-analyzer`)
 - rust-lang#138306 (Revert "Use workspace lints for crates in `compiler/` rust-lang#138084")

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 44ec67f into rust-lang:master Mar 10, 2025
6 checks passed
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Mar 10, 2025
@rust-timer
Unrolled build for rust-lang#138306
7461f4f 
Rollup merge of rust-lang#138306 - jieyouxu:revert-workspace-lints, r=Noratrieb

Revert "Use workspace lints for crates in `compiler/` rust-lang#138084"

Revert <rust-lang#138084> to buy time to consider options that avoids breaking downstream usages of cargo on distributed `rustc-src` artifacts, where such cargo invocations fail due to inability to inherit `lints` from workspace root manifest's `workspace.lints` (this is only valid for the source rust-lang/rust workspace, but not really the distributed `rustc-src` artifacts). The problem is that the `rustc-src` component doesn't include the root `Cargo.toml` manifest.

This breakage was reported in rust-lang#138304.

This reverts commit 48caf81, reversing changes made to c666287.

cc `@RalfJung`

r? `@nnethercote` (sorry, I didn't consider this being a thing 💀)
@rustbot rustbot added this to the 1.87.0 milestone Mar 10, 2025
@jieyouxu jieyouxu deleted the revert-workspace-lints branch March 10, 2025 21:56
@nnethercote
Copy link
Contributor

Apologies for the breakage. Is there a test that could be written that would have caught this problem?

@jieyouxu
Copy link
Member Author

jieyouxu commented Mar 10, 2025 •
edited
Loading

Apologies for the breakage. Is there a test that could be written that would have caught this problem?

To be able to catch this, we probably would've needed to be inspecting the dist artifacts. We'd also need to be aware about the rustc-src dist component in particular in the first place (and I also completely missed that, so...).

cc #136822

@jieyouxu jieyouxu mentioned this pull request Mar 11, 2025
Open
@RalfJung
Copy link
Member

Apologies for the breakage. Is there a test that could be written that would have caught this problem?

No worries, it's not the first time rustc-src has been broken. It's tricky to test.

@nnethercote nnethercote mentioned this pull request Mar 11, 2025
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@nnethercote nnethercote

Labels
A-attributes Area: Attributes (`#[…]`, `#![…]`) A-query-system Area: The rustc query system (https://rustc-dev-guide.rust-lang.org/query.html) A-translation Area: Translation infrastructure, and migrating existing diagnostics to SessionDiagnostic PG-exploit-mitigations Project group: Exploit mitigations S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)
Projects
None yet
Milestone
1.87.0
Development

Successfully merging this pull request may close these issues.
6 participants
@jieyouxu @rustbot @Noratrieb @bors @nnethercote @RalfJung