Skip to content

Commit ec7f196

Browse files
borsbors
committed
Auto merge of rust-lang#137416 - compiler-errors:rollup-frbb5t3, r=compiler-errors
Rollup of 10 pull requests Successful merges: - rust-lang#136642 (Put the alloc unit tests in a separate alloctests package) - rust-lang#136910 (Implement feature `isolate_most_least_significant_one` for integer types) - rust-lang#137183 (Prune dead regionck code) - rust-lang#137333 (Use `edition = "2024"` in the compiler (redux)) - rust-lang#137356 (Ferris 🦀 Identifier naming conventions) - rust-lang#137362 (Add build step log for `run-make-support`) - rust-lang#137377 (Always allow reusing cratenum in CrateLoader::load) - rust-lang#137388 (Fix(lib/fs/tests): Disable rename POSIX semantics FS tests under Windows 7) - rust-lang#137410 (Use StableHasher + Hash64 for dep_tracking_hash) - rust-lang#137413 (jubilee cleared out the review queue) r? `@ghost` `@rustbot` modify labels: rollup
2 parents b6d3be4 + 0b0e891 commit ec7f196

File tree

253 files changed

+1283
-1163
lines changed

Some content is hidden

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

253 files changed

+1283
-1163
lines changed

‎Cargo.lock

+1
Original file line numberDiff line numberDiff line change
@@ -3779,6 +3779,7 @@ dependencies = [
37793779
"rustc_fluent_macro",
37803780
"rustc_fs_util",
37813781
"rustc_graphviz",
3782+
"rustc_hashes",
37823783
"rustc_hir",
37833784
"rustc_macros",
37843785
"rustc_middle",

‎compiler/rustc/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "rustc-main"
33
version = "0.0.0"
4-
edition = "2021"
4+
edition = "2024"
55

66
[dependencies]
77
# tidy-alphabetical-start

‎compiler/rustc/src/main.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ fn main() {
6565
// linking, so we need to explicitly depend on the function.
6666
#[cfg(target_os = "macos")]
6767
{
68-
extern "C" {
68+
unsafe extern "C" {
6969
fn _rjem_je_zone_register();
7070
}
7171

‎compiler/rustc_abi/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "rustc_abi"
33
version = "0.0.0"
4-
edition = "2021"
4+
edition = "2024"
55

66
[dependencies]
77
# tidy-alphabetical-start

‎compiler/rustc_abi/src/lib.rs

+9-9
Original file line numberDiff line numberDiff line change
@@ -329,19 +329,19 @@ impl TargetDataLayout {
329329
[p] if p.starts_with('P') => {
330330
dl.instruction_address_space = parse_address_space(&p[1..], "P")?
331331
}
332-
["a", ref a @ ..] => dl.aggregate_align = parse_align(a, "a")?,
333-
["f16", ref a @ ..] => dl.f16_align = parse_align(a, "f16")?,
334-
["f32", ref a @ ..] => dl.f32_align = parse_align(a, "f32")?,
335-
["f64", ref a @ ..] => dl.f64_align = parse_align(a, "f64")?,
336-
["f128", ref a @ ..] => dl.f128_align = parse_align(a, "f128")?,
332+
["a", a @ ..] => dl.aggregate_align = parse_align(a, "a")?,
333+
["f16", a @ ..] => dl.f16_align = parse_align(a, "f16")?,
334+
["f32", a @ ..] => dl.f32_align = parse_align(a, "f32")?,
335+
["f64", a @ ..] => dl.f64_align = parse_align(a, "f64")?,
336+
["f128", a @ ..] => dl.f128_align = parse_align(a, "f128")?,
337337
// FIXME(erikdesjardins): we should be parsing nonzero address spaces
338338
// this will require replacing TargetDataLayout::{pointer_size,pointer_align}
339339
// with e.g. `fn pointer_size_in(AddressSpace)`
340-
[p @ "p", s, ref a @ ..] | [p @ "p0", s, ref a @ ..] => {
340+
[p @ "p", s, a @ ..] | [p @ "p0", s, a @ ..] => {
341341
dl.pointer_size = parse_size(s, p)?;
342342
dl.pointer_align = parse_align(a, p)?;
343343
}
344-
[s, ref a @ ..] if s.starts_with('i') => {
344+
[s, a @ ..] if s.starts_with('i') => {
345345
let Ok(bits) = s[1..].parse::<u64>() else {
346346
parse_size(&s[1..], "i")?; // For the user error.
347347
continue;
@@ -362,7 +362,7 @@ impl TargetDataLayout {
362362
dl.i128_align = a;
363363
}
364364
}
365-
[s, ref a @ ..] if s.starts_with('v') => {
365+
[s, a @ ..] if s.starts_with('v') => {
366366
let v_size = parse_size(&s[1..], "v")?;
367367
let a = parse_align(a, s)?;
368368
if let Some(v) = dl.vector_align.iter_mut().find(|v| v.0 == v_size) {
@@ -1802,7 +1802,7 @@ where
18021802
variants,
18031803
max_repr_align,
18041804
unadjusted_abi_align,
1805-
ref randomization_seed,
1805+
randomization_seed,
18061806
} = self;
18071807
f.debug_struct("Layout")
18081808
.field("size", size)

‎compiler/rustc_arena/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "rustc_arena"
33
version = "0.0.0"
4-
edition = "2021"
4+
edition = "2024"
55

66
[dependencies]
77
# tidy-alphabetical-start

‎compiler/rustc_ast/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "rustc_ast"
33
version = "0.0.0"
4-
edition = "2021"
4+
edition = "2024"
55

66
[dependencies]
77
# tidy-alphabetical-start

‎compiler/rustc_ast/src/visit.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -597,7 +597,7 @@ pub fn walk_use_tree<'a, V: Visitor<'a>>(
597597
visit_opt!(visitor, visit_ident, rename);
598598
}
599599
UseTreeKind::Glob => {}
600-
UseTreeKind::Nested { ref items, span: _ } => {
600+
UseTreeKind::Nested { items, span: _ } => {
601601
for &(ref nested_tree, nested_id) in items {
602602
try_visit!(visitor.visit_use_tree(nested_tree, nested_id, true));
603603
}

‎compiler/rustc_ast_ir/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "rustc_ast_ir"
33
version = "0.0.0"
4-
edition = "2021"
4+
edition = "2024"
55

66
[dependencies]
77
# tidy-alphabetical-start

‎compiler/rustc_ast_lowering/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "rustc_ast_lowering"
33
version = "0.0.0"
4-
edition = "2021"
4+
edition = "2024"
55

66
[lib]
77
doctest = false

‎compiler/rustc_ast_passes/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "rustc_ast_passes"
33
version = "0.0.0"
4-
edition = "2021"
4+
edition = "2024"
55

66
[dependencies]
77
# tidy-alphabetical-start

‎compiler/rustc_ast_pretty/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "rustc_ast_pretty"
33
version = "0.0.0"
4-
edition = "2021"
4+
edition = "2024"
55

66
[dependencies]
77
# tidy-alphabetical-start

‎compiler/rustc_attr_data_structures/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "rustc_attr_data_structures"
33
version = "0.0.0"
4-
edition = "2021"
4+
edition = "2024"
55

66
[dependencies]
77
# tidy-alphabetical-start

‎compiler/rustc_attr_parsing/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "rustc_attr_parsing"
33
version = "0.0.0"
4-
edition = "2021"
4+
edition = "2024"
55

66
[dependencies]
77
# tidy-alphabetical-start

‎compiler/rustc_baked_icu_data/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "rustc_baked_icu_data"
33
version = "0.0.0"
4-
edition = "2021"
4+
edition = "2024"
55

66
[dependencies]
77
# tidy-alphabetical-start

‎compiler/rustc_borrowck/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "rustc_borrowck"
33
version = "0.0.0"
4-
edition = "2021"
4+
edition = "2024"
55

66
[dependencies]
77
# tidy-alphabetical-start

‎compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2617,7 +2617,7 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
26172617
if let hir::Pat { kind: hir::PatKind::Binding(_, hir_id, _ident, _), .. } =
26182618
local.pat
26192619
&& let Some(init) = local.init
2620-
&& let hir::Expr {
2620+
&& let &hir::Expr {
26212621
kind:
26222622
hir::ExprKind::Closure(&hir::Closure {
26232623
kind: hir::ClosureKind::Closure,

‎compiler/rustc_borrowck/src/diagnostics/explain_borrow.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -262,7 +262,7 @@ impl<'tcx> BorrowExplanation<'tcx> {
262262
fn visit_expr(&mut self, expr: &'hir hir::Expr<'hir>) {
263263
if let hir::ExprKind::If(cond, _conseq, _alt)
264264
| hir::ExprKind::Loop(
265-
hir::Block {
265+
&hir::Block {
266266
expr:
267267
Some(&hir::Expr {
268268
kind: hir::ExprKind::If(cond, _conseq, _alt),

‎compiler/rustc_borrowck/src/diagnostics/mod.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1126,7 +1126,7 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
11261126
let hir_id = self.infcx.tcx.local_def_id_to_hir_id(def_id);
11271127
let expr = &self.infcx.tcx.hir().expect_expr(hir_id).kind;
11281128
debug!("closure_span: hir_id={:?} expr={:?}", hir_id, expr);
1129-
if let hir::ExprKind::Closure(&hir::Closure { kind, fn_decl_span, .. }) = expr {
1129+
if let &hir::ExprKind::Closure(&hir::Closure { kind, fn_decl_span, .. }) = expr {
11301130
for (captured_place, place) in
11311131
self.infcx.tcx.closure_captures(def_id).iter().zip(places)
11321132
{

‎compiler/rustc_borrowck/src/diagnostics/region_name.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -681,7 +681,7 @@ impl<'tcx> MirBorrowckCtxt<'_, '_, 'tcx> {
681681
let mir_hir_id = self.mir_hir_id();
682682

683683
let (return_span, mir_description, hir_ty) = match tcx.hir_node(mir_hir_id) {
684-
hir::Node::Expr(hir::Expr {
684+
hir::Node::Expr(&hir::Expr {
685685
kind: hir::ExprKind::Closure(&hir::Closure { fn_decl, kind, fn_decl_span, .. }),
686686
..
687687
}) => {
@@ -873,7 +873,7 @@ impl<'tcx> MirBorrowckCtxt<'_, '_, 'tcx> {
873873
.name;
874874

875875
let yield_span = match tcx.hir_node(self.mir_hir_id()) {
876-
hir::Node::Expr(hir::Expr {
876+
hir::Node::Expr(&hir::Expr {
877877
kind: hir::ExprKind::Closure(&hir::Closure { fn_decl_span, .. }),
878878
..
879879
}) => tcx.sess.source_map().end_point(fn_decl_span),

‎compiler/rustc_borrowck/src/universal_regions.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ impl<'tcx> UniversalRegions<'tcx> {
308308

309309
/// Returns an iterator over all the RegionVids corresponding to
310310
/// universally quantified free regions.
311-
pub(crate) fn universal_regions_iter(&self) -> impl Iterator<Item = RegionVid> {
311+
pub(crate) fn universal_regions_iter(&self) -> impl Iterator<Item = RegionVid> + use<> {
312312
(FIRST_GLOBAL_INDEX..self.num_universals).map(RegionVid::from_usize)
313313
}
314314

‎compiler/rustc_builtin_macros/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "rustc_builtin_macros"
33
version = "0.0.0"
4-
edition = "2021"
4+
edition = "2024"
55

66

77
[lints.rust]

‎compiler/rustc_codegen_cranelift/patches/0029-stdlib-Disable-f16-and-f128-in-compiler-builtins.patch

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ index 7165c3e48af..968552ad435 100644
1212
--- a/library/alloc/Cargo.toml
1313
+++ b/library/alloc/Cargo.toml
1414
@@ -11,7 +11,7 @@ test = { path = "../test" }
15-
edition = "2021"
15+
bench = false
1616

1717
[dependencies]
1818
core = { path = "../core" }
1919
-compiler_builtins = { version = "=0.1.146", features = ['rustc-dep-of-std'] }
2020
+compiler_builtins = { version = "=0.1.146", features = ['rustc-dep-of-std', 'no-f16-f128'] }
2121

22-
[dev-dependencies]
23-
rand = { version = "0.8.5", default-features = false, features = ["alloc"] }
22+
[features]
23+
compiler-builtins-mem = ['compiler_builtins/mem']
2424
--
2525
2.34.1
2626

‎compiler/rustc_codegen_llvm/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "rustc_codegen_llvm"
33
version = "0.0.0"
4-
edition = "2021"
4+
edition = "2024"
55

66
[lib]
77
test = false

‎compiler/rustc_codegen_llvm/src/llvm/enzyme_ffi.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use super::ffi::{BasicBlock, Metadata, Module, Type, Value};
77
use crate::llvm::Bool;
88

99
#[link(name = "llvm-wrapper", kind = "static")]
10-
extern "C" {
10+
unsafe extern "C" {
1111
// Enzyme
1212
pub(crate) fn LLVMRustHasMetadata(I: &Value, KindID: c_uint) -> bool;
1313
pub(crate) fn LLVMRustEraseInstUntilInclusive(BB: &BasicBlock, I: &Value);
@@ -18,7 +18,7 @@ extern "C" {
1818
pub(crate) fn LLVMRustVerifyFunction(V: &Value, action: LLVMRustVerifierFailureAction) -> Bool;
1919
}
2020

21-
extern "C" {
21+
unsafe extern "C" {
2222
// Enzyme
2323
pub(crate) fn LLVMDumpModule(M: &Module);
2424
pub(crate) fn LLVMDumpValue(V: &Value);

‎compiler/rustc_codegen_ssa/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "rustc_codegen_ssa"
33
version = "0.0.0"
4-
edition = "2021"
4+
edition = "2024"
55

66
[dependencies]
77
# tidy-alphabetical-start

‎compiler/rustc_codegen_ssa/src/back/symbol_export.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -183,11 +183,11 @@ fn exported_symbols_provider_local(
183183
});
184184

185185
let mut symbols: Vec<_> =
186-
sorted.iter().map(|(&def_id, &info)| (ExportedSymbol::NonGeneric(def_id), info)).collect();
186+
sorted.iter().map(|&(&def_id, &info)| (ExportedSymbol::NonGeneric(def_id), info)).collect();
187187

188188
// Export TLS shims
189189
if !tcx.sess.target.dll_tls_export {
190-
symbols.extend(sorted.iter().filter_map(|(&def_id, &info)| {
190+
symbols.extend(sorted.iter().filter_map(|&(&def_id, &info)| {
191191
tcx.needs_thread_local_shim(def_id).then(|| {
192192
(
193193
ExportedSymbol::ThreadLocalShim(def_id),

‎compiler/rustc_codegen_ssa/src/codegen_attrs.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -894,7 +894,7 @@ fn autodiff_attrs(tcx: TyCtxt<'_>, id: DefId) -> Option<AutoDiffAttrs> {
894894
let [mode, input_activities @ .., ret_activity] = &list[..] else {
895895
span_bug!(attr.span, "rustc_autodiff attribute must contain mode and activities");
896896
};
897-
let mode = if let MetaItemInner::MetaItem(MetaItem { path: ref p1, .. }) = mode {
897+
let mode = if let MetaItemInner::MetaItem(MetaItem { path: p1, .. }) = mode {
898898
p1.segments.first().unwrap().ident
899899
} else {
900900
span_bug!(attr.span, "rustc_autodiff attribute must contain mode");
@@ -910,7 +910,7 @@ fn autodiff_attrs(tcx: TyCtxt<'_>, id: DefId) -> Option<AutoDiffAttrs> {
910910
};
911911

912912
// First read the ret symbol from the attribute
913-
let ret_symbol = if let MetaItemInner::MetaItem(MetaItem { path: ref p1, .. }) = ret_activity {
913+
let ret_symbol = if let MetaItemInner::MetaItem(MetaItem { path: p1, .. }) = ret_activity {
914914
p1.segments.first().unwrap().ident
915915
} else {
916916
span_bug!(attr.span, "rustc_autodiff attribute must contain the return activity");
@@ -924,7 +924,7 @@ fn autodiff_attrs(tcx: TyCtxt<'_>, id: DefId) -> Option<AutoDiffAttrs> {
924924
// Now parse all the intermediate (input) activities
925925
let mut arg_activities: Vec<DiffActivity> = vec![];
926926
for arg in input_activities {
927-
let arg_symbol = if let MetaItemInner::MetaItem(MetaItem { path: ref p2, .. }) = arg {
927+
let arg_symbol = if let MetaItemInner::MetaItem(MetaItem { path: p2, .. }) = arg {
928928
match p2.segments.first() {
929929
Some(x) => x.ident,
930930
None => {

‎compiler/rustc_codegen_ssa/src/mir/block.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -720,14 +720,14 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
720720

721721
// Put together the arguments to the panic entry point.
722722
let (lang_item, args) = match msg {
723-
AssertKind::BoundsCheck { ref len, ref index } => {
723+
AssertKind::BoundsCheck { len, index } => {
724724
let len = self.codegen_operand(bx, len).immediate();
725725
let index = self.codegen_operand(bx, index).immediate();
726726
// It's `fn panic_bounds_check(index: usize, len: usize)`,
727727
// and `#[track_caller]` adds an implicit third argument.
728728
(LangItem::PanicBoundsCheck, vec![index, len, location])
729729
}
730-
AssertKind::MisalignedPointerDereference { ref required, ref found } => {
730+
AssertKind::MisalignedPointerDereference { required, found } => {
731731
let required = self.codegen_operand(bx, required).immediate();
732732
let found = self.codegen_operand(bx, found).immediate();
733733
// It's `fn panic_misaligned_pointer_dereference(required: usize, found: usize)`,

‎compiler/rustc_codegen_ssa/src/mir/operand.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -584,7 +584,7 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
584584
// Moves out of scalar and scalar pair fields are trivial.
585585
for elem in place_ref.projection.iter() {
586586
match elem {
587-
mir::ProjectionElem::Field(ref f, _) => {
587+
mir::ProjectionElem::Field(f, _) => {
588588
assert!(
589589
!o.layout.ty.is_any_ptr(),
590590
"Bad PlaceRef: destructing pointers should use cast/PtrMetadata, \

‎compiler/rustc_const_eval/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "rustc_const_eval"
33
version = "0.0.0"
4-
edition = "2021"
4+
edition = "2024"
55

66
[dependencies]
77
# tidy-alphabetical-start

‎compiler/rustc_const_eval/src/const_eval/machine.rs

+4-6
Original file line numberDiff line numberDiff line change
@@ -502,12 +502,10 @@ impl<'tcx> interpret::Machine<'tcx> for CompileTimeMachine<'tcx> {
502502
RemainderByZero(op) => RemainderByZero(eval_to_int(op)?),
503503
ResumedAfterReturn(coroutine_kind) => ResumedAfterReturn(*coroutine_kind),
504504
ResumedAfterPanic(coroutine_kind) => ResumedAfterPanic(*coroutine_kind),
505-
MisalignedPointerDereference { ref required, ref found } => {
506-
MisalignedPointerDereference {
507-
required: eval_to_int(required)?,
508-
found: eval_to_int(found)?,
509-
}
510-
}
505+
MisalignedPointerDereference { required, found } => MisalignedPointerDereference {
506+
required: eval_to_int(required)?,
507+
found: eval_to_int(found)?,
508+
},
511509
NullPointerDereference => NullPointerDereference,
512510
};
513511
Err(ConstEvalErrKind::AssertFailure(err)).into()

‎compiler/rustc_data_structures/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "rustc_data_structures"
33
version = "0.0.0"
4-
edition = "2021"
4+
edition = "2024"
55

66
[dependencies]
77
# tidy-alphabetical-start

0 commit comments

Comments
 (0)