Skip to content
This repository was archived by the owner on May 28, 2025. It is now read-only.
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit ed897d5

Browse files
committedMar 9, 2025·
Auto merge of rust-lang#138267 - matthiaskrgr:rollup-vt76bhs, r=matthiaskrgr
Rollup of 12 pull requests Successful merges: - rust-lang#136127 (Allow `*const W<dyn A> -> *const dyn A` ptr cast) - rust-lang#136968 (Turn order dependent trait objects future incompat warning into a hard error) - rust-lang#137319 (Stabilize `const_vec_string_slice`) - rust-lang#137885 (tidy: add triagebot checks) - rust-lang#138040 (compiler: Use `size_of` from the prelude instead of imported) - rust-lang#138084 (Use workspace lints for crates in `compiler/`) - rust-lang#138158 (Move more layouting logic to `rustc_abi`) - rust-lang#138160 (depend more on attr_data_structures and move find_attr! there) - rust-lang#138192 (crashes: couple more tests) - rust-lang#138216 (bootstrap: Fix stack printing when a step cycle is detected) - rust-lang#138232 (Reduce verbosity of GCC build log) - rust-lang#138242 (Revert "Don't test new error messages with the stage 0 compiler") r? `@ghost` `@rustbot` modify labels: rollup
2 parents 4f52199 + f7ef35b commit ed897d5

File tree

273 files changed

+2399
-1359
lines changed

Some content is hidden

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

273 files changed

+2399
-1359
lines changed
 

‎Cargo.lock

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3297,6 +3297,7 @@ dependencies = [
32973297
"rustc_hir",
32983298
"rustc_lexer",
32993299
"rustc_macros",
3300+
"rustc_middle",
33003301
"rustc_serialize",
33013302
"rustc_session",
33023303
"rustc_span",
@@ -3752,7 +3753,7 @@ dependencies = [
37523753
"rustc_abi",
37533754
"rustc_ast",
37543755
"rustc_ast_pretty",
3755-
"rustc_attr_parsing",
3756+
"rustc_attr_data_structures",
37563757
"rustc_hir",
37573758
"rustc_span",
37583759
]
@@ -4020,7 +4021,8 @@ dependencies = [
40204021
"rustc_apfloat",
40214022
"rustc_arena",
40224023
"rustc_ast",
4023-
"rustc_attr_parsing",
4024+
"rustc_ast_ir",
4025+
"rustc_attr_data_structures",
40244026
"rustc_data_structures",
40254027
"rustc_error_messages",
40264028
"rustc_errors",
@@ -5271,6 +5273,7 @@ dependencies = [
52715273
"serde",
52725274
"similar",
52735275
"termcolor",
5276+
"toml 0.7.8",
52745277
"walkdir",
52755278
]
52765279

‎Cargo.toml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,20 @@ 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+
6680
[profile.release.package.rustc-rayon-core]
6781
# The rustc fork of Rayon has deadlock detection code which intermittently
6882
# causes overflows in the CI (see https://github.com/rust-lang/rust/issues/90227)

0 commit comments

Comments
 (0)