Skip to content

Commit 57a8a7e

Browse files
committed
Auto merge of #132736 - matthiaskrgr:rollup-66naqwb, r=matthiaskrgr
Rollup of 4 pull requests Successful merges: - #132638 (Remove fixme comment about clobber_abi on PowerPC) - #132726 (Remove unused intercrate dependencies) - #132729 (Make fn_abi_sanity_check a bit stricter) - #132734 ( remove 'platform-intrinsic' ABI leftovers) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 9a77c3c + fd41a37 commit 57a8a7e

File tree

17 files changed

+72
-61
lines changed

17 files changed

+72
-61
lines changed

Cargo.lock

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3274,7 +3274,6 @@ name = "rustc_ast_lowering"
32743274
version = "0.0.0"
32753275
dependencies = [
32763276
"rustc_ast",
3277-
"rustc_ast_pretty",
32783277
"rustc_data_structures",
32793278
"rustc_errors",
32803279
"rustc_fluent_macro",
@@ -3469,7 +3468,6 @@ dependencies = [
34693468
"rustc_macros",
34703469
"rustc_metadata",
34713470
"rustc_middle",
3472-
"rustc_monomorphize",
34733471
"rustc_query_system",
34743472
"rustc_serialize",
34753473
"rustc_session",
@@ -3745,7 +3743,6 @@ dependencies = [
37453743
"rustc_feature",
37463744
"rustc_fluent_macro",
37473745
"rustc_hir",
3748-
"rustc_hir_pretty",
37493746
"rustc_index",
37503747
"rustc_infer",
37513748
"rustc_lint_defs",
@@ -3793,7 +3790,6 @@ dependencies = [
37933790
"rustc_middle",
37943791
"rustc_session",
37953792
"rustc_span",
3796-
"rustc_target",
37973793
"rustc_trait_selection",
37983794
"rustc_type_ir",
37993795
"smallvec",
@@ -3853,9 +3849,7 @@ dependencies = [
38533849
"rustc_index",
38543850
"rustc_macros",
38553851
"rustc_middle",
3856-
"rustc_next_trait_solver",
38573852
"rustc_span",
3858-
"rustc_target",
38593853
"rustc_type_ir",
38603854
"smallvec",
38613855
"thin-vec",
@@ -3934,7 +3928,6 @@ dependencies = [
39343928
"rustc_feature",
39353929
"rustc_fluent_macro",
39363930
"rustc_hir",
3937-
"rustc_hir_pretty",
39383931
"rustc_index",
39393932
"rustc_infer",
39403933
"rustc_macros",
@@ -4162,7 +4155,6 @@ dependencies = [
41624155
name = "rustc_next_trait_solver"
41634156
version = "0.0.0"
41644157
dependencies = [
4165-
"bitflags 2.6.0",
41664158
"derive-where",
41674159
"rustc_ast_ir",
41684160
"rustc_data_structures",
@@ -4458,9 +4450,7 @@ dependencies = [
44584450
"object 0.36.4",
44594451
"rustc_abi",
44604452
"rustc_data_structures",
4461-
"rustc_feature",
44624453
"rustc_fs_util",
4463-
"rustc_index",
44644454
"rustc_macros",
44654455
"rustc_serialize",
44664456
"rustc_span",
@@ -4492,8 +4482,6 @@ dependencies = [
44924482
"rustc_middle",
44934483
"rustc_next_trait_solver",
44944484
"rustc_parse_format",
4495-
"rustc_query_system",
4496-
"rustc_serialize",
44974485
"rustc_session",
44984486
"rustc_span",
44994487
"rustc_transmute",

compiler/rustc/src/main.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
// We need this feature as it changes `dylib` linking behavior and allows us to link to `rustc_driver`.
22
#![feature(rustc_private)]
3+
// Several crates are depended upon but unused so that they are present in the sysroot
4+
#![expect(unused_crate_dependencies)]
35

46
// A note about jemalloc: rustc uses jemalloc when built for CI and
57
// distribution. The obvious way to do this is with the `#[global_allocator]`

compiler/rustc_ast_lowering/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ doctest = false
99
[dependencies]
1010
# tidy-alphabetical-start
1111
rustc_ast = { path = "../rustc_ast" }
12-
rustc_ast_pretty = { path = "../rustc_ast_pretty" }
1312
rustc_data_structures = { path = "../rustc_data_structures" }
1413
rustc_errors = { path = "../rustc_errors" }
1514
rustc_fluent_macro = { path = "../rustc_fluent_macro" }

compiler/rustc_codegen_cranelift/src/intrinsics/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//! Codegen of intrinsics. This includes `extern "rust-intrinsic"`, `extern "platform-intrinsic"`
1+
//! Codegen of intrinsics. This includes `extern "rust-intrinsic"`,
22
//! and LLVM intrinsics that have symbol names starting with `llvm.`.
33
44
macro_rules! intrinsic_args {

compiler/rustc_codegen_cranelift/src/intrinsics/simd.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//! Codegen `extern "platform-intrinsic"` intrinsics.
1+
//! Codegen SIMD intrinsics.
22
33
use cranelift_codegen::ir::immediates::Offset32;
44
use rustc_target::abi::Endian;

compiler/rustc_codegen_ssa/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ rustc_index = { path = "../rustc_index" }
2828
rustc_macros = { path = "../rustc_macros" }
2929
rustc_metadata = { path = "../rustc_metadata" }
3030
rustc_middle = { path = "../rustc_middle" }
31-
rustc_monomorphize = { path = "../rustc_monomorphize" }
3231
rustc_query_system = { path = "../rustc_query_system" }
3332
rustc_serialize = { path = "../rustc_serialize" }
3433
rustc_session = { path = "../rustc_session" }

compiler/rustc_hir_analysis/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ rustc_errors = { path = "../rustc_errors" }
1919
rustc_feature = { path = "../rustc_feature" }
2020
rustc_fluent_macro = { path = "../rustc_fluent_macro" }
2121
rustc_hir = { path = "../rustc_hir" }
22-
rustc_hir_pretty = { path = "../rustc_hir_pretty" }
2322
rustc_index = { path = "../rustc_index" }
2423
rustc_infer = { path = "../rustc_infer" }
2524
rustc_lint_defs = { path = "../rustc_lint_defs" }

compiler/rustc_hir_analysis/src/check/intrinsic.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
//! Type-checking for the rust-intrinsic and platform-intrinsic
2-
//! intrinsics that the compiler exposes.
1+
//! Type-checking for the rust-intrinsic intrinsics that the compiler exposes.
32
43
use rustc_abi::ExternAbi;
54
use rustc_errors::codes::*;

compiler/rustc_hir_typeck/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ rustc_macros = { path = "../rustc_macros" }
2323
rustc_middle = { path = "../rustc_middle" }
2424
rustc_session = { path = "../rustc_session" }
2525
rustc_span = { path = "../rustc_span" }
26-
rustc_target = { path = "../rustc_target" }
2726
rustc_trait_selection = { path = "../rustc_trait_selection" }
2827
rustc_type_ir = { path = "../rustc_type_ir" }
2928
smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }

compiler/rustc_infer/Cargo.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ rustc_hir = { path = "../rustc_hir" }
1616
rustc_index = { path = "../rustc_index" }
1717
rustc_macros = { path = "../rustc_macros" }
1818
rustc_middle = { path = "../rustc_middle" }
19-
rustc_next_trait_solver = { path = "../rustc_next_trait_solver" }
2019
rustc_span = { path = "../rustc_span" }
21-
rustc_target = { path = "../rustc_target" }
2220
rustc_type_ir = { path = "../rustc_type_ir" }
2321
smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }
2422
thin-vec = "0.2.12"

0 commit comments

Comments
 (0)