Skip to content

Commit 9fb94b3

Browse files
committed
Auto merge of rust-lang#138310 - matthiaskrgr:rollup-zvbpuei, r=matthiaskrgr
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
2 parents 2b285cd + 44ec67f commit 9fb94b3

File tree

347 files changed

+4967
-2279
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

347 files changed

+4967
-2279
lines changed

.github/workflows/post-merge.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,21 @@ jobs:
1616
pull-requests: write
1717
steps:
1818
- uses: actions/checkout@v4
19+
with:
20+
# Make sure that we have enough commits to find the parent merge commit.
21+
# Since all merges should be through merge commits, fetching two commits
22+
# should be enough to get the parent bors merge commit.
23+
fetch-depth: 2
1924
- name: Perform analysis and send PR
25+
env:
26+
GH_TOKEN: ${{ github.token }}
2027
run: |
2128
# Get closest bors merge commit
2229
PARENT_COMMIT=`git rev-list --author='bors <bors@rust-lang.org>' -n1 --first-parent HEAD^1`
30+
echo "Parent: ${PARENT_COMMIT}"
2331
2432
# Find PR for the current commit
2533
HEAD_PR=`gh pr list --search "${{ github.sha }}" --state merged --json number --jq '.[0].number'`
26-
27-
echo "Parent: ${PARENT_COMMIT}"
2834
echo "HEAD: ${{ github.sha }} (#${HEAD_PR})"
2935
3036
cd src/ci/citool

Cargo.toml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -63,20 +63,6 @@ exclude = [
6363
"src/tools/x",
6464
]
6565

66-
# These lints are applied to many crates in the workspace. In practice, this is
67-
# all crates under `compiler/`.
68-
#
69-
# NOTE: rustc-specific lints (e.g. `rustc::internal`) aren't supported by
70-
# Cargo. (Support for them is possibly blocked by #44690 (attributes for
71-
# tools).) Those lints are instead specified for `compiler/` crates in
72-
# `src/bootstrap/src/core/builder/cargo.rs`.
73-
[workspace.lints.rust]
74-
# FIXME(edition_2024): Change this to `-Wrust_2024_idioms` when all of the
75-
# individual lints are satisfied.
76-
keyword_idents_2024 = "warn"
77-
unreachable_pub = "warn"
78-
unsafe_op_in_unsafe_fn = "warn"
79-
8066
[profile.release.package.rustc-rayon-core]
8167
# The rustc fork of Rayon has deadlock detection code which intermittently
8268
# causes overflows in the CI (see https://github.com/rust-lang/rust/issues/90227)

compiler/rustc/Cargo.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,3 @@ llvm = ['rustc_driver_impl/llvm']
3232
max_level_info = ['rustc_driver_impl/max_level_info']
3333
rustc_randomized_layouts = ['rustc_driver_impl/rustc_randomized_layouts']
3434
# tidy-alphabetical-end
35-
36-
[lints]
37-
workspace = true

compiler/rustc_abi/Cargo.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,3 @@ nightly = [
3131
]
3232
randomize = ["dep:rand", "dep:rand_xoshiro", "nightly"]
3333
# tidy-alphabetical-end
34-
35-
[lints]
36-
workspace = true

compiler/rustc_abi/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#![cfg_attr(feature = "nightly", feature(rustc_attrs))]
66
#![cfg_attr(feature = "nightly", feature(rustdoc_internals))]
77
#![cfg_attr(feature = "nightly", feature(step_trait))]
8+
#![warn(unreachable_pub)]
89
// tidy-alphabetical-end
910

1011
/*! ABI handling for rustc

compiler/rustc_arena/Cargo.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,3 @@ edition = "2024"
77
# tidy-alphabetical-start
88
smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }
99
# tidy-alphabetical-end
10-
11-
[lints]
12-
workspace = true

compiler/rustc_arena/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
#![feature(maybe_uninit_slice)]
2424
#![feature(rustc_attrs)]
2525
#![feature(rustdoc_internals)]
26+
#![warn(unreachable_pub)]
2627
// tidy-alphabetical-end
2728

2829
use std::alloc::Layout;

compiler/rustc_ast/Cargo.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,3 @@ smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }
1818
thin-vec = "0.2.12"
1919
tracing = "0.1"
2020
# tidy-alphabetical-end
21-
22-
[lints]
23-
workspace = true

compiler/rustc_ast/src/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#![feature(never_type)]
2020
#![feature(rustdoc_internals)]
2121
#![feature(stmt_expr_attributes)]
22+
#![warn(unreachable_pub)]
2223
// tidy-alphabetical-end
2324

2425
pub mod util {

compiler/rustc_ast_ir/Cargo.toml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,3 @@ nightly = [
1919
"dep:rustc_macros",
2020
"dep:rustc_span",
2121
]
22-
23-
[lints]
24-
workspace = true

0 commit comments

Comments
 (0)