bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Auto merge of #137420 - matthiaskrgr:rollup-rr0q37f, r=matthiaskrgr

Browse source 
Rollup of 9 pull requests

Successful merges:

 - #136910 (Implement feature `isolate_most_least_significant_one` for integer types)
 - #137183 (Prune dead regionck code)
 - #137333 (Use `edition = "2024"` in the compiler (redux))
 - #137356 (Ferris 🦀 Identifier naming conventions)
 - #137362 (Add build step log for `run-make-support`)
 - #137377 (Always allow reusing cratenum in CrateLoader::load)
 - #137388 (Fix(lib/fs/tests): Disable rename POSIX semantics FS tests under Windows 7)
 - #137410 (Use StableHasher + Hash64 for dep_tracking_hash)
 - #137413 (jubilee cleared out the review queue)

r? `@ghost`
`@rustbot` modify labels: rollup
This commit is contained in:
bors 2025-02-22 13:32:44 +00:00
commit 15469f8f8a
173 changed files with 692 additions and 561 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Cargo.lock
View file

@ -3779,6 +3779,7 @@ dependencies = [
"rustc_fluent_macro",
"rustc_fs_util",
"rustc_graphviz",
"rustc_hashes",
"rustc_hir",
"rustc_macros",
"rustc_middle",

2
compiler/rustc/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "rustc-main"
version = "0.0.0"
edition = "2021"
edition = "2024"
[dependencies]
# tidy-alphabetical-start

2
compiler/rustc/src/main.rs
View file

@ -65,7 +65,7 @@ fn main() {
// linking, so we need to explicitly depend on the function.
#[cfg(target_os = "macos")]
{
extern "C" {
unsafe extern "C" {
fn _rjem_je_zone_register();
}

2
compiler/rustc_abi/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "rustc_abi"
version = "0.0.0"
edition = "2021"
edition = "2024"
[dependencies]
# tidy-alphabetical-start

18
compiler/rustc_abi/src/lib.rs
View file

@ -329,19 +329,19 @@ impl TargetDataLayout {
[p] if p.starts_with('P') => {
dl.instruction_address_space = parse_address_space(&p[1..], "P")?
}
["a", ref a @ ..] => dl.aggregate_align = parse_align(a, "a")?,
["f16", ref a @ ..] => dl.f16_align = parse_align(a, "f16")?,
["f32", ref a @ ..] => dl.f32_align = parse_align(a, "f32")?,
["f64", ref a @ ..] => dl.f64_align = parse_align(a, "f64")?,
["f128", ref a @ ..] => dl.f128_align = parse_align(a, "f128")?,
["a", a @ ..] => dl.aggregate_align = parse_align(a, "a")?,
["f16", a @ ..] => dl.f16_align = parse_align(a, "f16")?,
["f32", a @ ..] => dl.f32_align = parse_align(a, "f32")?,
["f64", a @ ..] => dl.f64_align = parse_align(a, "f64")?,
["f128", a @ ..] => dl.f128_align = parse_align(a, "f128")?,
// FIXME(erikdesjardins): we should be parsing nonzero address spaces
// this will require replacing TargetDataLayout::{pointer_size,pointer_align}
// with e.g. `fn pointer_size_in(AddressSpace)`
[p @ "p", s, ref a @ ..] | [p @ "p0", s, ref a @ ..] => {
[p @ "p", s, a @ ..] | [p @ "p0", s, a @ ..] => {
dl.pointer_size = parse_size(s, p)?;
dl.pointer_align = parse_align(a, p)?;
}
[s, ref a @ ..] if s.starts_with('i') => {
[s, a @ ..] if s.starts_with('i') => {
let Ok(bits) = s[1..].parse::<u64>() else {
parse_size(&s[1..], "i")?; // For the user error.
continue;
@ -362,7 +362,7 @@ impl TargetDataLayout {
dl.i128_align = a;
}
}
[s, ref a @ ..] if s.starts_with('v') => {
[s, a @ ..] if s.starts_with('v') => {
let v_size = parse_size(&s[1..], "v")?;
let a = parse_align(a, s)?;
if let Some(v) = dl.vector_align.iter_mut().find(|v| v.0 == v_size) {
@ -1802,7 +1802,7 @@ where
variants,
max_repr_align,
unadjusted_abi_align,
ref randomization_seed,
randomization_seed,
} = self;
f.debug_struct("Layout")
.field("size", size)

2
compiler/rustc_arena/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "rustc_arena"
version = "0.0.0"
edition = "2021"
edition = "2024"
[dependencies]
# tidy-alphabetical-start

2
compiler/rustc_ast/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "rustc_ast"
version = "0.0.0"
edition = "2021"
edition = "2024"
[dependencies]
# tidy-alphabetical-start

2
compiler/rustc_ast/src/visit.rs
View file

@ -597,7 +597,7 @@ pub fn walk_use_tree<'a, V: Visitor<'a>>(
visit_opt!(visitor, visit_ident, rename);
}
UseTreeKind::Glob => {}
UseTreeKind::Nested { ref items, span: _ } => {
UseTreeKind::Nested { items, span: _ } => {
for &(ref nested_tree, nested_id) in items {
try_visit!(visitor.visit_use_tree(nested_tree, nested_id, true));
}

2
compiler/rustc_ast_ir/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "rustc_ast_ir"
version = "0.0.0"
edition = "2021"
edition = "2024"
[dependencies]
# tidy-alphabetical-start

2
compiler/rustc_ast_lowering/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "rustc_ast_lowering"
version = "0.0.0"
edition = "2021"
edition = "2024"
[lib]
doctest = false

2
compiler/rustc_ast_passes/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "rustc_ast_passes"
version = "0.0.0"
edition = "2021"
edition = "2024"
[dependencies]
# tidy-alphabetical-start

2
compiler/rustc_ast_pretty/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "rustc_ast_pretty"
version = "0.0.0"
edition = "2021"
edition = "2024"
[dependencies]
# tidy-alphabetical-start

2
compiler/rustc_attr_data_structures/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "rustc_attr_data_structures"
version = "0.0.0"
edition = "2021"
edition = "2024"
[dependencies]
# tidy-alphabetical-start

2
compiler/rustc_attr_parsing/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "rustc_attr_parsing"
version = "0.0.0"
edition = "2021"
edition = "2024"
[dependencies]
# tidy-alphabetical-start

2
compiler/rustc_baked_icu_data/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "rustc_baked_icu_data"
version = "0.0.0"
edition = "2021"
edition = "2024"
[dependencies]
# tidy-alphabetical-start

2
compiler/rustc_borrowck/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "rustc_borrowck"
version = "0.0.0"
edition = "2021"
edition = "2024"
[dependencies]
# tidy-alphabetical-start

2
compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs
View file

@ -2617,7 +2617,7 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
if let hir::Pat { kind: hir::PatKind::Binding(_, hir_id, _ident, _), .. } =
local.pat
&& let Some(init) = local.init
&& let hir::Expr {
&& let &hir::Expr {
kind:
hir::ExprKind::Closure(&hir::Closure {
kind: hir::ClosureKind::Closure,

2
compiler/rustc_borrowck/src/diagnostics/explain_borrow.rs
View file

@ -262,7 +262,7 @@ impl<'tcx> BorrowExplanation<'tcx> {
fn visit_expr(&mut self, expr: &'hir hir::Expr<'hir>) {
if let hir::ExprKind::If(cond, _conseq, _alt)
| hir::ExprKind::Loop(
hir::Block {
&hir::Block {
expr:
Some(&hir::Expr {
kind: hir::ExprKind::If(cond, _conseq, _alt),

2
compiler/rustc_borrowck/src/diagnostics/mod.rs
View file

@ -1126,7 +1126,7 @@ impl<'infcx, 'tcx> MirBorrowckCtxt<'_, 'infcx, 'tcx> {
let hir_id = self.infcx.tcx.local_def_id_to_hir_id(def_id);
let expr = &self.infcx.tcx.hir().expect_expr(hir_id).kind;
debug!("closure_span: hir_id={:?} expr={:?}", hir_id, expr);
if let hir::ExprKind::Closure(&hir::Closure { kind, fn_decl_span, .. }) = expr {
if let &hir::ExprKind::Closure(&hir::Closure { kind, fn_decl_span, .. }) = expr {
for (captured_place, place) in
self.infcx.tcx.closure_captures(def_id).iter().zip(places)
{

4
compiler/rustc_borrowck/src/diagnostics/region_name.rs
View file

@ -681,7 +681,7 @@ impl<'tcx> MirBorrowckCtxt<'_, '_, 'tcx> {
let mir_hir_id = self.mir_hir_id();
let (return_span, mir_description, hir_ty) = match tcx.hir_node(mir_hir_id) {
hir::Node::Expr(hir::Expr {
hir::Node::Expr(&hir::Expr {
kind: hir::ExprKind::Closure(&hir::Closure { fn_decl, kind, fn_decl_span, .. }),
..
}) => {
@ -873,7 +873,7 @@ impl<'tcx> MirBorrowckCtxt<'_, '_, 'tcx> {
.name;
let yield_span = match tcx.hir_node(self.mir_hir_id()) {
hir::Node::Expr(hir::Expr {
hir::Node::Expr(&hir::Expr {
kind: hir::ExprKind::Closure(&hir::Closure { fn_decl_span, .. }),
..
}) => tcx.sess.source_map().end_point(fn_decl_span),

2
compiler/rustc_borrowck/src/universal_regions.rs
View file

@ -308,7 +308,7 @@ impl<'tcx> UniversalRegions<'tcx> {
/// Returns an iterator over all the RegionVids corresponding to
/// universally quantified free regions.
pub(crate) fn universal_regions_iter(&self) -> impl Iterator<Item = RegionVid> {
pub(crate) fn universal_regions_iter(&self) -> impl Iterator<Item = RegionVid> + use<> {
(FIRST_GLOBAL_INDEX..self.num_universals).map(RegionVid::from_usize)
}

2
compiler/rustc_builtin_macros/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "rustc_builtin_macros"
version = "0.0.0"
edition = "2021"
edition = "2024"
[lints.rust]

2
compiler/rustc_codegen_llvm/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "rustc_codegen_llvm"
version = "0.0.0"
edition = "2021"
edition = "2024"
[lib]
test = false

4
compiler/rustc_codegen_llvm/src/llvm/enzyme_ffi.rs
View file

@ -7,7 +7,7 @@ use super::ffi::{BasicBlock, Metadata, Module, Type, Value};
use crate::llvm::Bool;
#[link(name = "llvm-wrapper", kind = "static")]
extern "C" {
unsafe extern "C" {
// Enzyme
pub(crate) fn LLVMRustHasMetadata(I: &Value, KindID: c_uint) -> bool;
pub(crate) fn LLVMRustEraseInstUntilInclusive(BB: &BasicBlock, I: &Value);
@ -18,7 +18,7 @@ extern "C" {
pub(crate) fn LLVMRustVerifyFunction(V: &Value, action: LLVMRustVerifierFailureAction) -> Bool;
}
extern "C" {
unsafe extern "C" {
// Enzyme
pub(crate) fn LLVMDumpModule(M: &Module);
pub(crate) fn LLVMDumpValue(V: &Value);

2
compiler/rustc_codegen_ssa/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "rustc_codegen_ssa"
version = "0.0.0"
edition = "2021"
edition = "2024"
[dependencies]
# tidy-alphabetical-start

4
compiler/rustc_codegen_ssa/src/back/symbol_export.rs
View file

@ -183,11 +183,11 @@ fn exported_symbols_provider_local(
});
let mut symbols: Vec<_> =
sorted.iter().map(|(&def_id, &info)| (ExportedSymbol::NonGeneric(def_id), info)).collect();
sorted.iter().map(|&(&def_id, &info)| (ExportedSymbol::NonGeneric(def_id), info)).collect();
// Export TLS shims
if !tcx.sess.target.dll_tls_export {
symbols.extend(sorted.iter().filter_map(|(&def_id, &info)| {
symbols.extend(sorted.iter().filter_map(|&(&def_id, &info)| {
tcx.needs_thread_local_shim(def_id).then(|| {
(
ExportedSymbol::ThreadLocalShim(def_id),

6
compiler/rustc_codegen_ssa/src/codegen_attrs.rs
View file

@ -894,7 +894,7 @@ fn autodiff_attrs(tcx: TyCtxt<'_>, id: DefId) -> Option<AutoDiffAttrs> {
let [mode, input_activities @ .., ret_activity] = &list[..] else {
span_bug!(attr.span, "rustc_autodiff attribute must contain mode and activities");
};
let mode = if let MetaItemInner::MetaItem(MetaItem { path: ref p1, .. }) = mode {
let mode = if let MetaItemInner::MetaItem(MetaItem { path: p1, .. }) = mode {
p1.segments.first().unwrap().ident
} else {
span_bug!(attr.span, "rustc_autodiff attribute must contain mode");
@ -910,7 +910,7 @@ fn autodiff_attrs(tcx: TyCtxt<'_>, id: DefId) -> Option<AutoDiffAttrs> {
};
// First read the ret symbol from the attribute
let ret_symbol = if let MetaItemInner::MetaItem(MetaItem { path: ref p1, .. }) = ret_activity {
let ret_symbol = if let MetaItemInner::MetaItem(MetaItem { path: p1, .. }) = ret_activity {
p1.segments.first().unwrap().ident
} else {
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> {
// Now parse all the intermediate (input) activities
let mut arg_activities: Vec<DiffActivity> = vec![];
for arg in input_activities {
let arg_symbol = if let MetaItemInner::MetaItem(MetaItem { path: ref p2, .. }) = arg {
let arg_symbol = if let MetaItemInner::MetaItem(MetaItem { path: p2, .. }) = arg {
match p2.segments.first() {
Some(x) => x.ident,
None => {

4
compiler/rustc_codegen_ssa/src/mir/block.rs
View file

@ -720,14 +720,14 @@ impl<'a, 'tcx, Bx: BuilderMethods<'a, 'tcx>> FunctionCx<'a, 'tcx, Bx> {
// Put together the arguments to the panic entry point.
let (lang_item, args) = match msg {
AssertKind::BoundsCheck { ref len, ref index } => {
AssertKind::BoundsCheck { len, index } => {
let len = self.codegen_operand(bx, len).immediate();
let index = self.codegen_operand(bx, index).immediate();
// It's `fn panic_bounds_check(index: usize, len: usize)`,
// and `#[track_caller]` adds an implicit third argument.
(LangItem::PanicBoundsCheck, vec![index, len, location])
}
AssertKind::MisalignedPointerDereference { ref required, ref found } => {
AssertKind::MisalignedPointerDereference { required, found } => {
let required = self.codegen_operand(bx, required).immediate();
let found = self.codegen_operand(bx, found).immediate();
// It's `fn panic_misaligned_pointer_dereference(required: usize, found: usize)`,

2
compiler/rustc_codegen_ssa/src/mir/operand.rs
View file

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

2
compiler/rustc_const_eval/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "rustc_const_eval"
version = "0.0.0"
edition = "2021"
edition = "2024"
[dependencies]
# tidy-alphabetical-start

10
compiler/rustc_const_eval/src/const_eval/machine.rs
View file

@ -502,12 +502,10 @@ impl<'tcx> interpret::Machine<'tcx> for CompileTimeMachine<'tcx> {
RemainderByZero(op) => RemainderByZero(eval_to_int(op)?),
ResumedAfterReturn(coroutine_kind) => ResumedAfterReturn(*coroutine_kind),
ResumedAfterPanic(coroutine_kind) => ResumedAfterPanic(*coroutine_kind),
MisalignedPointerDereference { ref required, ref found } => {
MisalignedPointerDereference {
required: eval_to_int(required)?,
found: eval_to_int(found)?,
}
}
MisalignedPointerDereference { required, found } => MisalignedPointerDereference {
required: eval_to_int(required)?,
found: eval_to_int(found)?,
},
NullPointerDereference => NullPointerDereference,
};
Err(ConstEvalErrKind::AssertFailure(err)).into()

2
compiler/rustc_data_structures/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "rustc_data_structures"
version = "0.0.0"
edition = "2021"
edition = "2024"
[dependencies]
# tidy-alphabetical-start

2
compiler/rustc_data_structures/src/graph/scc/mod.rs
View file

@ -133,7 +133,7 @@ impl<N: Idx, S: Idx + Ord, A: Annotation> Sccs<N, S, A> {
/// meaning that if `S1 -> S2`, we will visit `S2` first and `S1` after.
/// This is convenient when the edges represent dependencies: when you visit
/// `S1`, the value for `S2` will already have been computed.
pub fn all_sccs(&self) -> impl Iterator<Item = S> {
pub fn all_sccs(&self) -> impl Iterator<Item = S> + use<N, S, A> {
(0..self.scc_data.len()).map(S::new)
}

2
compiler/rustc_data_structures/src/sorted_map/tests.rs
View file

@ -24,7 +24,7 @@ fn test_sorted_index_multi_map() {
// `get_by_key` returns items in insertion order.
let twos: Vec<_> = set.get_by_key_enumerated(2).collect();
let idxs: Vec<usize> = twos.iter().map(|(i, _)| *i).collect();
let values: Vec<usize> = twos.iter().map(|(_, &v)| v).collect();
let values: Vec<usize> = twos.iter().map(|&(_, &v)| v).collect();
assert_eq!(idxs, vec![0, 2, 4]);
assert_eq!(values, vec![0, 1, 2]);

2
compiler/rustc_driver/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "rustc_driver"
version = "0.0.0"
edition = "2021"
edition = "2024"
[lib]
crate-type = ["dylib"]

2
compiler/rustc_driver_impl/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "rustc_driver_impl"
version = "0.0.0"
edition = "2021"
edition = "2024"
[dependencies]
# tidy-alphabetical-start

2
compiler/rustc_error_codes/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "rustc_error_codes"
version = "0.0.0"
edition = "2021"
edition = "2024"
[dependencies]
# tidy-alphabetical-start

2
compiler/rustc_error_messages/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "rustc_error_messages"
version = "0.0.0"
edition = "2021"
edition = "2024"
[dependencies]
# tidy-alphabetical-start

2
compiler/rustc_errors/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "rustc_errors"
version = "0.0.0"
edition = "2021"
edition = "2024"
[dependencies]
# tidy-alphabetical-start

2
compiler/rustc_expand/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "rustc_expand"
version = "0.0.0"
edition = "2021"
edition = "2024"
build = false
[lib]

4
compiler/rustc_expand/src/mbe/transcribe.rs
View file

@ -258,7 +258,7 @@ pub(super) fn transcribe<'a>(
}
// Replace the meta-var with the matched token tree from the invocation.
mbe::TokenTree::MetaVar(mut sp, mut original_ident) => {
&mbe::TokenTree::MetaVar(mut sp, mut original_ident) => {
// Find the matched nonterminal from the macro invocation, and use it to replace
// the meta-var.
//
@ -376,7 +376,7 @@ pub(super) fn transcribe<'a>(
// We will produce all of the results of the inside of the `Delimited` and then we will
// jump back out of the Delimited, pop the result_stack and add the new results back to
// the previous results (from outside the Delimited).
mbe::TokenTree::Delimited(mut span, spacing, delimited) => {
&mbe::TokenTree::Delimited(mut span, ref spacing, ref delimited) => {
mut_visit::visit_delim_span(&mut marker, &mut span);
stack.push(Frame::new_delimited(delimited, span, *spacing));
result_stack.push(mem::take(&mut result));

2
compiler/rustc_expand/src/proc_macro.rs
View file

@ -31,7 +31,7 @@ impl<T> pm::bridge::server::MessagePipe<T> for MessagePipe<T> {
}
}
fn exec_strategy(ecx: &ExtCtxt<'_>) -> impl pm::bridge::server::ExecutionStrategy {
fn exec_strategy(ecx: &ExtCtxt<'_>) -> impl pm::bridge::server::ExecutionStrategy + use<> {
pm::bridge::server::MaybeCrossThread::<MessagePipe<_>>::new(
ecx.sess.opts.unstable_opts.proc_macro_execution_strategy
== ProcMacroExecutionStrategy::CrossThread,

2
compiler/rustc_feature/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "rustc_feature"
version = "0.0.0"
edition = "2021"
edition = "2024"
[dependencies]
# tidy-alphabetical-start

2
compiler/rustc_fluent_macro/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "rustc_fluent_macro"
version = "0.0.0"
edition = "2021"
edition = "2024"
[lib]
proc-macro = true

2
compiler/rustc_fs_util/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "rustc_fs_util"
version = "0.0.0"
edition = "2021"
edition = "2024"
[dependencies]
# tidy-alphabetical-start

2
compiler/rustc_graphviz/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "rustc_graphviz"
version = "0.0.0"
edition = "2021"
edition = "2024"
[dependencies]
# tidy-alphabetical-start

2
compiler/rustc_hashes/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "rustc_hashes"
version = "0.0.0"
edition = "2021"
edition = "2024"
[dependencies]
# tidy-alphabetical-start

2
compiler/rustc_hir/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "rustc_hir"
version = "0.0.0"
edition = "2021"
edition = "2024"
[dependencies]
# tidy-alphabetical-start

4
compiler/rustc_hir/src/hir/tests.rs
View file

@ -9,11 +9,11 @@ macro_rules! define_tests {
let unambig = $kind::$variant::<'_, ()> { $($init)* };
let unambig_to_ambig = unsafe { std::mem::transmute::<_, $kind<'_, AmbigArg>>(unambig) };
assert!(matches!(&unambig_to_ambig, $kind::$variant { $($init)* }));
assert!(matches!(&unambig_to_ambig, &$kind::$variant { $($init)* }));
let ambig_to_unambig = unsafe { std::mem::transmute::<_, $kind<'_, ()>>(unambig_to_ambig) };
assert!(matches!(&ambig_to_unambig, $kind::$variant { $($init)* }));
assert!(matches!(&ambig_to_unambig, &$kind::$variant { $($init)* }));
}
)*};
}

12
compiler/rustc_hir/src/intravisit.rs
View file

@ -593,9 +593,9 @@ pub fn walk_item<'v, V: Visitor<'v>>(visitor: &mut V, item: &'v Item<'v>) -> V::
defaultness: _,
polarity: _,
defaultness_span: _,
ref generics,
ref of_trait,
ref self_ty,
generics,
of_trait,
self_ty,
items,
}) => {
try_visit!(visitor.visit_id(item.hir_id()));
@ -1045,7 +1045,7 @@ pub fn walk_generic_param<'v, V: Visitor<'v>>(
}
GenericParamKind::Const { ref ty, ref default, synthetic: _ } => {
try_visit!(visitor.visit_ty_unambig(ty));
if let Some(ref default) = default {
if let Some(default) = default {
try_visit!(visitor.visit_const_param_default(param.hir_id, default));
}
}
@ -1401,8 +1401,8 @@ pub fn walk_assoc_item_constraint<'v, V: Visitor<'v>>(
try_visit!(visitor.visit_generic_args(constraint.gen_args));
match constraint.kind {
AssocItemConstraintKind::Equality { ref term } => match term {
Term::Ty(ref ty) => try_visit!(visitor.visit_ty_unambig(ty)),
Term::Const(ref c) => try_visit!(visitor.visit_const_arg_unambig(c)),
Term::Ty(ty) => try_visit!(visitor.visit_ty_unambig(ty)),
Term::Const(c) => try_visit!(visitor.visit_const_arg_unambig(c)),
},
AssocItemConstraintKind::Bound { bounds } => {
walk_list!(visitor, visit_param_bound, bounds)

2
compiler/rustc_hir_analysis/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "rustc_hir_analysis"
version = "0.0.0"
edition = "2021"
edition = "2024"
[lib]
test = false

2
compiler/rustc_hir_analysis/src/collect/type_of.rs
View file

@ -106,7 +106,7 @@ fn anon_const_type_of<'tcx>(icx: &ItemCtxt<'tcx>, def_id: LocalDefId) -> Ty<'tcx
}
}
}
Node::Variant(Variant { disr_expr: Some(ref e), .. }) if e.hir_id == hir_id => {
Node::Variant(Variant { disr_expr: Some(e), .. }) if e.hir_id == hir_id => {
tcx.adt_def(tcx.hir_get_parent_item(hir_id)).repr().discr_type().to_ty(tcx)
}
// Sort of affects the type system, but only for the purpose of diagnostics

7
compiler/rustc_hir_analysis/src/hir_ty_lowering/mod.rs
View file

@ -1226,11 +1226,10 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
adt_def.variants().iter().find(|s| s.name == variant_name)
{
let mut suggestion = vec![(assoc_ident.span, variant_name.to_string())];
if let hir::Node::Stmt(hir::Stmt {
kind: hir::StmtKind::Semi(ref expr),
..
if let hir::Node::Stmt(&hir::Stmt {
kind: hir::StmtKind::Semi(expr), ..
})
| hir::Node::Expr(ref expr) = tcx.parent_hir_node(hir_ref_id)
| hir::Node::Expr(expr) = tcx.parent_hir_node(hir_ref_id)
&& let hir::ExprKind::Struct(..) = expr.kind
{
match variant.ctor {

2
compiler/rustc_hir_pretty/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "rustc_hir_pretty"
version = "0.0.0"
edition = "2021"
edition = "2024"
[dependencies]
# tidy-alphabetical-start

2
compiler/rustc_hir_pretty/src/lib.rs
View file

@ -1856,7 +1856,7 @@ impl<'a> State<'a> {
self.word_space("=");
match term {
Term::Ty(ty) => self.print_type(ty),
Term::Const(ref c) => self.print_const_arg(c),
Term::Const(c) => self.print_const_arg(c),
}
}
hir::AssocItemConstraintKind::Bound { bounds } => {

2
compiler/rustc_hir_typeck/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "rustc_hir_typeck"
version = "0.0.0"
edition = "2021"
edition = "2024"
[dependencies]
# tidy-alphabetical-start

4
compiler/rustc_hir_typeck/src/callee.rs
View file

@ -346,7 +346,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
return;
};
let fn_decl_span = if let hir::Node::Expr(hir::Expr {
let fn_decl_span = if let hir::Node::Expr(&hir::Expr {
kind: hir::ExprKind::Closure(&hir::Closure { fn_decl_span, .. }),
..
}) = self.tcx.parent_hir_node(hir_id)
@ -371,7 +371,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
{
// Actually need to unwrap one more layer of HIR to get to
// the _real_ closure...
if let hir::Node::Expr(hir::Expr {
if let hir::Node::Expr(&hir::Expr {
kind: hir::ExprKind::Closure(&hir::Closure { fn_decl_span, .. }),
..
}) = self.tcx.parent_hir_node(parent_hir_id)

2
compiler/rustc_hir_typeck/src/coercion.rs
View file

@ -1887,7 +1887,7 @@ impl<'tcx, 'exprs, E: AsCoercionSite> CoerceMany<'tcx, 'exprs, E> {
let parent_id = fcx.tcx.parent_hir_id(block_or_return_id);
let parent = fcx.tcx.hir_node(parent_id);
if let Some(expr) = expression
&& let hir::Node::Expr(hir::Expr {
&& let hir::Node::Expr(&hir::Expr {
kind: hir::ExprKind::Closure(&hir::Closure { body, .. }),
..
}) = parent

10
compiler/rustc_hir_typeck/src/demand.rs
View file

@ -577,9 +577,9 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
let mut parent;
'outer: loop {
// Climb the HIR tree to see if the current `Expr` is part of a `break;` statement.
let (hir::Node::Stmt(hir::Stmt { kind: hir::StmtKind::Semi(&ref p), .. })
| hir::Node::Block(hir::Block { expr: Some(&ref p), .. })
| hir::Node::Expr(&ref p)) = self.tcx.hir_node(parent_id)
let (hir::Node::Stmt(&hir::Stmt { kind: hir::StmtKind::Semi(p), .. })
| hir::Node::Block(&hir::Block { expr: Some(p), .. })
| hir::Node::Expr(p)) = self.tcx.hir_node(parent_id)
else {
break;
};
@ -593,13 +593,13 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
loop {
// Climb the HIR tree to find the (desugared) `loop` this `break` corresponds to.
let parent = match self.tcx.hir_node(parent_id) {
hir::Node::Expr(&ref parent) => {
hir::Node::Expr(parent) => {
parent_id = self.tcx.parent_hir_id(parent.hir_id);
parent
}
hir::Node::Stmt(hir::Stmt {
hir_id,
kind: hir::StmtKind::Semi(&ref parent) | hir::StmtKind::Expr(&ref parent),
kind: hir::StmtKind::Semi(parent) | hir::StmtKind::Expr(parent),
..
}) => {
parent_id = self.tcx.parent_hir_id(*hir_id);

2
compiler/rustc_hir_typeck/src/fallback.rs
View file

@ -503,7 +503,7 @@ impl<'tcx> FnCtxt<'_, 'tcx> {
let unit_errors = remaining_errors_if_fallback_to(self.tcx.types.unit);
if unit_errors.is_empty()
&& let mut never_errors = remaining_errors_if_fallback_to(self.tcx.types.never)
&& let [ref mut never_error, ..] = never_errors.as_mut_slice()
&& let [never_error, ..] = never_errors.as_mut_slice()
{
self.adjust_fulfillment_error_for_expr_obligation(never_error);
let sugg = self.try_to_suggest_annotations(diverging_vids, coercions);

14
compiler/rustc_hir_typeck/src/method/confirm.rs
View file

@ -11,7 +11,7 @@ use rustc_hir_analysis::hir_ty_lowering::{
};
use rustc_infer::infer::{self, DefineOpaqueTypes, InferOk};
use rustc_lint::builtin::SUPERTRAIT_ITEM_SHADOWING_USAGE;
use rustc_middle::traits::{ObligationCauseCode, UnifyReceiverContext};
use rustc_middle::traits::ObligationCauseCode;
use rustc_middle::ty::adjustment::{
Adjust, Adjustment, AllowTwoPhase, AutoBorrow, AutoBorrowMutability, PointerCoercion,
};
@ -136,7 +136,7 @@ impl<'a, 'tcx> ConfirmContext<'a, 'tcx> {
"confirm: self_ty={:?} method_sig_rcvr={:?} method_sig={:?} method_predicates={:?}",
self_ty, method_sig_rcvr, method_sig, method_predicates
);
self.unify_receivers(self_ty, method_sig_rcvr, pick, all_args);
self.unify_receivers(self_ty, method_sig_rcvr, pick);
let (method_sig, method_predicates) =
self.normalize(self.span, (method_sig, method_predicates));
@ -525,20 +525,12 @@ impl<'a, 'tcx> ConfirmContext<'a, 'tcx> {
self_ty: Ty<'tcx>,
method_self_ty: Ty<'tcx>,
pick: &probe::Pick<'tcx>,
args: GenericArgsRef<'tcx>,
) {
debug!(
"unify_receivers: self_ty={:?} method_self_ty={:?} span={:?} pick={:?}",
self_ty, method_self_ty, self.span, pick
);
let cause = self.cause(
self.self_expr.span,
ObligationCauseCode::UnifyReceiver(Box::new(UnifyReceiverContext {
assoc_item: pick.item,
param_env: self.param_env,
args,
})),
);
let cause = self.cause(self.self_expr.span, ObligationCauseCode::Misc);
match self.at(&cause, self.param_env).sup(DefineOpaqueTypes::Yes, method_self_ty, self_ty) {
Ok(InferOk { obligations, value: () }) => {
self.register_predicates(obligations);

2
compiler/rustc_hir_typeck/src/method/probe.rs
View file

@ -873,7 +873,7 @@ impl<'a, 'tcx> ProbeContext<'a, 'tcx> {
#[instrument(level = "debug", skip(self))]
fn assemble_inherent_candidates_from_object(&mut self, self_ty: Ty<'tcx>) {
let principal = match self_ty.kind() {
ty::Dynamic(ref data, ..) => Some(data),
ty::Dynamic(data, ..) => Some(data),
_ => None,
}
.and_then(|data| data.principal())

9
compiler/rustc_hir_typeck/src/method/suggest.rs
View file

@ -1586,10 +1586,8 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
if let SelfSource::QPath(ty) = source
&& let hir::Node::Expr(ref path_expr) = self.tcx.parent_hir_node(ty.hir_id)
&& let hir::ExprKind::Path(_) = path_expr.kind
&& let hir::Node::Stmt(hir::Stmt {
kind: hir::StmtKind::Semi(ref parent), ..
})
| hir::Node::Expr(ref parent) = self.tcx.parent_hir_node(path_expr.hir_id)
&& let hir::Node::Stmt(&hir::Stmt { kind: hir::StmtKind::Semi(parent), .. })
| hir::Node::Expr(parent) = self.tcx.parent_hir_node(path_expr.hir_id)
{
let replacement_span =
if let hir::ExprKind::Call(..) | hir::ExprKind::Struct(..) = parent.kind {
@ -3149,8 +3147,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
let mut derives_grouped = Vec::<(String, Span, String)>::new();
for (self_name, self_span, trait_name) in derives.into_iter() {
if let Some((last_self_name, _, ref mut last_trait_names)) = derives_grouped.last_mut()
{
if let Some((last_self_name, _, last_trait_names)) = derives_grouped.last_mut() {
if last_self_name == &self_name {
last_trait_names.push_str(format!(", {trait_name}").as_str());
continue;

4
compiler/rustc_hir_typeck/src/pat.rs
View file

@ -324,7 +324,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
let PatInfo { binding_mode, max_ref_mutbl, top_info: ti, current_depth, .. } = pat_info;
let path_res = match pat.kind {
PatKind::Expr(PatExpr { kind: PatExprKind::Path(ref qpath), hir_id, span }) => {
PatKind::Expr(PatExpr { kind: PatExprKind::Path(qpath), hir_id, span }) => {
Some(self.resolve_ty_and_res_fully_qualified_call(qpath, *hir_id, *span))
}
_ => None,
@ -344,7 +344,7 @@ impl<'a, 'tcx> FnCtxt<'a, 'tcx> {
PatKind::Wild | PatKind::Err(_) => expected,
// We allow any type here; we ensure that the type is uninhabited during match checking.
PatKind::Never => expected,
PatKind::Expr(PatExpr { kind: PatExprKind::Path(ref qpath), hir_id, span }) => {
PatKind::Expr(PatExpr { kind: PatExprKind::Path(qpath), hir_id, span }) => {
let ty = self.check_pat_path(
*hir_id,
pat.hir_id,

3
compiler/rustc_incremental/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "rustc_incremental"
version = "0.0.0"
edition = "2021"
edition = "2024"
[dependencies]
# tidy-alphabetical-start
@ -12,6 +12,7 @@ rustc_errors = { path = "../rustc_errors" }
rustc_fluent_macro = { path = "../rustc_fluent_macro" }
rustc_fs_util = { path = "../rustc_fs_util" }
rustc_graphviz = { path = "../rustc_graphviz" }
rustc_hashes = { path = "../rustc_hashes" }
rustc_hir = { path = "../rustc_hir" }
rustc_macros = { path = "../rustc_macros" }
rustc_middle = { path = "../rustc_middle" }

3
compiler/rustc_incremental/src/persist/load.rs
View file

@ -5,6 +5,7 @@ use std::sync::Arc;
use rustc_data_structures::memmap::Mmap;
use rustc_data_structures::unord::UnordMap;
use rustc_hashes::Hash64;
use rustc_middle::dep_graph::{DepGraph, DepsType, SerializedDepGraph, WorkProductMap};
use rustc_middle::query::on_disk_cache::OnDiskCache;
use rustc_serialize::Decodable;
@ -154,7 +155,7 @@ fn load_dep_graph(sess: &Session) -> LoadResult<(Arc<SerializedDepGraph>, WorkPr
sess.dcx().emit_warn(errors::CorruptFile { path: &path });
return LoadResult::DataOutOfDate;
};
let prev_commandline_args_hash = u64::decode(&mut decoder);
let prev_commandline_args_hash = Hash64::decode(&mut decoder);
if prev_commandline_args_hash != expected_hash {
if sess.opts.unstable_opts.incremental_info {

2
compiler/rustc_index/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "rustc_index"
version = "0.0.0"
edition = "2021"
edition = "2024"
[dependencies]
# tidy-alphabetical-start

20
compiler/rustc_index/src/bit_set.rs
View file

@ -723,7 +723,7 @@ impl<T: Idx> ChunkedBitSet<T> {
match self.chunks.get(chunk_index) {
Some(Zeros(_chunk_domain_size)) => ChunkIter::Zeros,
Some(Ones(chunk_domain_size)) => ChunkIter::Ones(0..*chunk_domain_size as usize),
Some(Mixed(chunk_domain_size, _, ref words)) => {
Some(Mixed(chunk_domain_size, _, words)) => {
let num_words = num_words(*chunk_domain_size as usize);
ChunkIter::Mixed(BitIter::new(&words[0..num_words]))
}
@ -752,11 +752,7 @@ impl<T: Idx> BitRelations<ChunkedBitSet<T>> for ChunkedBitSet<T> {
changed = true;
}
(
Mixed(
self_chunk_domain_size,
ref mut self_chunk_count,
ref mut self_chunk_words,
),
Mixed(self_chunk_domain_size, self_chunk_count, self_chunk_words),
Mixed(_other_chunk_domain_size, _other_chunk_count, other_chunk_words),
) => {
// First check if the operation would change
@ -836,11 +832,7 @@ impl<T: Idx> BitRelations<ChunkedBitSet<T>> for ChunkedBitSet<T> {
Mixed(*self_chunk_domain_size, self_chunk_count, Rc::new(self_chunk_words));
}
(
Mixed(
self_chunk_domain_size,
ref mut self_chunk_count,
ref mut self_chunk_words,
),
Mixed(self_chunk_domain_size, self_chunk_count, self_chunk_words),
Mixed(_other_chunk_domain_size, _other_chunk_count, other_chunk_words),
) => {
// See [`<Self as BitRelations<ChunkedBitSet<T>>>::union`] for the explanation
@ -891,11 +883,7 @@ impl<T: Idx> BitRelations<ChunkedBitSet<T>> for ChunkedBitSet<T> {
*self_chunk = other_chunk.clone();
}
(
Mixed(
self_chunk_domain_size,
ref mut self_chunk_count,
ref mut self_chunk_words,
),
Mixed(self_chunk_domain_size, self_chunk_count, self_chunk_words),
Mixed(_other_chunk_domain_size, _other_chunk_count, other_chunk_words),
) => {
// See [`<Self as BitRelations<ChunkedBitSet<T>>>::union`] for the explanation

2
compiler/rustc_index_macros/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "rustc_index_macros"
version = "0.0.0"
edition = "2021"
edition = "2024"
[lib]
proc-macro = true

2
compiler/rustc_infer/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "rustc_infer"
version = "0.0.0"
edition = "2021"
edition = "2024"
[lib]
doctest = false

2
compiler/rustc_interface/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "rustc_interface"
version = "0.0.0"
edition = "2021"
edition = "2024"
[dependencies]
# tidy-alphabetical-start

3
compiler/rustc_interface/src/errors.rs
View file

@ -24,8 +24,9 @@ pub(crate) struct CrateNameInvalid<'a> {
pub struct FerrisIdentifier {
#[primary_span]
pub spans: Vec<Span>,
#[suggestion(code = "ferris", applicability = "maybe-incorrect")]
#[suggestion(code = "{ferris_fix}", applicability = "maybe-incorrect")]
pub first_span: Span,
pub ferris_fix: &'static str,
}
#[derive(Diagnostic)]

55
compiler/rustc_interface/src/passes.rs
View file

@ -171,13 +171,15 @@ fn configure_and_expand(
new_path.push(path);
}
}
env::set_var(
"PATH",
&env::join_paths(
new_path.iter().filter(|p| env::join_paths(iter::once(p)).is_ok()),
)
.unwrap(),
);
unsafe {
env::set_var(
"PATH",
&env::join_paths(
new_path.iter().filter(|p| env::join_paths(iter::once(p)).is_ok()),
)
.unwrap(),
);
}
}
// Create the config for macro expansion
@ -216,7 +218,9 @@ fn configure_and_expand(
}
if cfg!(windows) {
env::set_var("PATH", &old_path);
unsafe {
env::set_var("PATH", &old_path);
}
}
krate
@ -301,8 +305,41 @@ fn early_lint_checks(tcx: TyCtxt<'_>, (): ()) {
for (ident, mut spans) in identifiers.drain(..) {
spans.sort();
if ident == sym::ferris {
enum FerrisFix {
SnakeCase,
ScreamingSnakeCase,
PascalCase,
}
impl FerrisFix {
const fn as_str(self) -> &'static str {
match self {
FerrisFix::SnakeCase => "ferris",
FerrisFix::ScreamingSnakeCase => "FERRIS",
FerrisFix::PascalCase => "Ferris",
}
}
}
let first_span = spans[0];
sess.dcx().emit_err(errors::FerrisIdentifier { spans, first_span });
let prev_source = sess.psess.source_map().span_to_prev_source(first_span);
let ferris_fix = prev_source
.map_or(FerrisFix::SnakeCase, |source| {
let mut source_before_ferris = source.trim_end().split_whitespace().rev();
match source_before_ferris.next() {
Some("struct" | "trait" | "mod" | "union" | "type" | "enum") => {
FerrisFix::PascalCase
}
Some("const" | "static") => FerrisFix::ScreamingSnakeCase,
Some("mut") if source_before_ferris.next() == Some("static") => {
FerrisFix::ScreamingSnakeCase
}
_ => FerrisFix::SnakeCase,
}
})
.as_str();
sess.dcx().emit_err(errors::FerrisIdentifier { spans, first_span, ferris_fix });
} else {
sess.dcx().emit_err(errors::EmojiIdentifier { spans, ident });
}

2
compiler/rustc_lexer/Cargo.toml
View file

@ -2,7 +2,7 @@
name = "rustc_lexer"
version = "0.0.0"
license = "MIT OR Apache-2.0"
edition = "2021"
edition = "2024"
repository = "https://github.com/rust-lang/rust/"
description = """
Rust lexer used by rustc. No stability guarantees are provided.

2
compiler/rustc_lint/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "rustc_lint"
version = "0.0.0"
edition = "2021"
edition = "2024"
[dependencies]
# tidy-alphabetical-start

6
compiler/rustc_lint/src/builtin.rs
View file

@ -975,10 +975,8 @@ declare_lint! {
/// ### Example
///
/// ```rust
/// #[no_mangle]
/// fn foo<T>(t: T) {
///
/// }
/// #[unsafe(no_mangle)]
/// fn foo<T>(t: T) {}
/// ```
///
/// {{produces}}

4
compiler/rustc_lint/src/foreign_modules.rs
View file

@ -35,12 +35,12 @@ declare_lint! {
///
/// ```rust
/// mod m {
/// extern "C" {
/// unsafe extern "C" {
/// fn foo();
/// }
/// }
///
/// extern "C" {
/// unsafe extern "C" {
/// fn foo(_: u32);
/// }
/// ```

6
compiler/rustc_lint/src/non_ascii_idents.rs
View file

@ -183,7 +183,7 @@ impl EarlyLintPass for NonAsciiIdents {
#[allow(rustc::potential_query_instability)]
let mut symbols: Vec<_> = symbols.iter().collect();
symbols.sort_by_key(|k| k.1);
for (symbol, &sp) in symbols.iter() {
for &(ref symbol, &sp) in symbols.iter() {
let symbol_str = symbol.as_str();
if symbol_str.is_ascii() {
continue;
@ -242,7 +242,7 @@ impl EarlyLintPass for NonAsciiIdents {
UnordMap::with_capacity(symbols.len());
let mut skeleton_buf = String::new();
for (&symbol, &sp) in symbols.iter() {
for &(&symbol, &sp) in symbols.iter() {
use unicode_security::confusable_detection::skeleton;
let symbol_str = symbol.as_str();
@ -298,7 +298,7 @@ impl EarlyLintPass for NonAsciiIdents {
script_states.insert(latin_augmented_script_set, ScriptSetUsage::Verified);
let mut has_suspicious = false;
for (symbol, &sp) in symbols.iter() {
for &(ref symbol, &sp) in symbols.iter() {
let symbol_str = symbol.as_str();
for ch in symbol_str.chars() {
if ch.is_ascii() {

2
compiler/rustc_lint/src/nonstandard_style.rs
View file

@ -344,7 +344,7 @@ impl<'tcx> LateLintPass<'tcx> for NonSnakeCase {
ast::attr::find_by_name(cx.tcx.hir().attrs(hir::CRATE_HIR_ID), sym::crate_name)
.and_then(|attr| {
if let AttrKind::Normal(n) = &attr.kind
&& let AttrItem { args: AttrArgs::Eq { eq_span: _, expr: ref lit }, .. } =
&& let AttrItem { args: AttrArgs::Eq { eq_span: _, expr: lit }, .. } =
n.as_ref()
&& let ast::LitKind::Str(name, ..) = lit.kind
{

4
compiler/rustc_lint/src/types.rs
View file

@ -696,7 +696,7 @@ declare_lint! {
/// ### Example
///
/// ```rust
/// extern "C" {
/// unsafe extern "C" {
/// static STATIC: String;
/// }
/// ```
@ -1791,7 +1791,7 @@ impl<'tcx> LateLintPass<'tcx> for VariantSizeDifferences {
let t = cx.tcx.type_of(it.owner_id).instantiate_identity();
let ty = cx.tcx.erase_regions(t);
let Ok(layout) = cx.layout_of(ty) else { return };
let Variants::Multiple { tag_encoding: TagEncoding::Direct, tag, ref variants, .. } =
let Variants::Multiple { tag_encoding: TagEncoding::Direct, tag, variants, .. } =
&layout.variants
else {
return;

2
compiler/rustc_lint_defs/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "rustc_lint_defs"
version = "0.0.0"
edition = "2021"
edition = "2024"
[dependencies]
# tidy-alphabetical-start

8
compiler/rustc_lint_defs/src/builtin.rs
View file

@ -2780,7 +2780,7 @@ declare_lint! {
///
/// ```rust
/// enum Void {}
/// extern {
/// unsafe extern {
/// static EXTERN: Void;
/// }
/// ```
@ -4011,7 +4011,7 @@ declare_lint! {
/// ```rust
/// #![warn(ffi_unwind_calls)]
///
/// extern "C-unwind" {
/// unsafe extern "C-unwind" {
/// fn foo();
/// }
///
@ -4755,7 +4755,7 @@ declare_lint! {
///
/// ### Example
///
/// ```rust
/// ```rust,edition2021
/// #![warn(missing_unsafe_on_extern)]
/// #![allow(dead_code)]
///
@ -4792,7 +4792,7 @@ declare_lint! {
///
/// ### Example
///
/// ```rust
/// ```rust,edition2021
/// #![warn(unsafe_attr_outside_unsafe)]
///
/// #[no_mangle]

4
compiler/rustc_lint_defs/src/lib.rs
View file

@ -134,8 +134,8 @@ impl LintExpectationId {
}
pub fn set_lint_index(&mut self, new_lint_index: Option<u16>) {
let (LintExpectationId::Unstable { ref mut lint_index, .. }
| LintExpectationId::Stable { ref mut lint_index, .. }) = self;
let (LintExpectationId::Unstable { lint_index, .. }
| LintExpectationId::Stable { lint_index, .. }) = self;
*lint_index = new_lint_index
}

2
compiler/rustc_llvm/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "rustc_llvm"
version = "0.0.0"
edition = "2021"
edition = "2024"
[dependencies]
# tidy-alphabetical-start

8
compiler/rustc_llvm/build.rs
View file

@ -51,9 +51,13 @@ fn detect_llvm_link() -> (&'static str, &'static str) {
fn restore_library_path() {
let key = tracked_env_var_os("REAL_LIBRARY_PATH_VAR").expect("REAL_LIBRARY_PATH_VAR");
if let Some(env) = tracked_env_var_os("REAL_LIBRARY_PATH") {
env::set_var(&key, env);
unsafe {
env::set_var(&key, env);
}
} else {
env::remove_var(&key);
unsafe {
env::remove_var(&key);
}
}
}

2
compiler/rustc_log/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "rustc_log"
version = "0.0.0"
edition = "2021"
edition = "2024"
[dependencies]
# tidy-alphabetical-start

2
compiler/rustc_macros/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "rustc_macros"
version = "0.0.0"
edition = "2021"
edition = "2024"
[lib]
proc-macro = true

4
compiler/rustc_macros/src/diagnostics/utils.rs
View file

@ -760,8 +760,8 @@ impl SubdiagnosticVariant {
}
(
"applicability",
SubdiagnosticKind::Suggestion { ref mut applicability, .. }
| SubdiagnosticKind::MultipartSuggestion { ref mut applicability, .. },
SubdiagnosticKind::Suggestion { applicability, .. }
| SubdiagnosticKind::MultipartSuggestion { applicability, .. },
) => {
let value = get_string!();
let value = Applicability::from_str(&value.value()).unwrap_or_else(|()| {

2
compiler/rustc_metadata/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "rustc_metadata"
version = "0.0.0"
edition = "2021"
edition = "2024"
[dependencies]
# tidy-alphabetical-start

30
compiler/rustc_metadata/src/creader.rs
View file

@ -762,29 +762,17 @@ impl<'a, 'tcx> CrateLoader<'a, 'tcx> {
// against a hash, we could load a crate which has the same hash
// as an already loaded crate. If this is the case prevent
// duplicates by just using the first crate.
//
// Note that we only do this for target triple crates, though, as we
// don't want to match a host crate against an equivalent target one
// already loaded.
let root = library.metadata.get_root();
// FIXME: why is this condition necessary? It was adding in #33625 but I
// don't know why and the original author doesn't remember ...
let can_reuse_cratenum =
locator.tuple == self.sess.opts.target_triple || locator.is_proc_macro;
Ok(Some(if can_reuse_cratenum {
let mut result = LoadResult::Loaded(library);
for (cnum, data) in self.cstore.iter_crate_data() {
if data.name() == root.name() && root.hash() == data.hash() {
assert!(locator.hash.is_none());
info!("load success, going to previous cnum: {}", cnum);
result = LoadResult::Previous(cnum);
break;
}
let mut result = LoadResult::Loaded(library);
for (cnum, data) in self.cstore.iter_crate_data() {
if data.name() == root.name() && root.hash() == data.hash() {
assert!(locator.hash.is_none());
info!("load success, going to previous cnum: {}", cnum);
result = LoadResult::Previous(cnum);
break;
}
result
} else {
LoadResult::Loaded(library)
}))
}
Ok(Some(result))
}
/// Go through the crate metadata and load any crates that it references.

2
compiler/rustc_middle/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "rustc_middle"
version = "0.0.0"
edition = "2021"
edition = "2024"
[dependencies]
# tidy-alphabetical-start

2
compiler/rustc_middle/src/middle/mod.rs
View file

@ -25,7 +25,7 @@ pub mod lib_features {
self.stability
.to_sorted_stable_ord()
.iter()
.map(|(&sym, &(stab, _))| (sym, stab))
.map(|&(&sym, &(stab, _))| (sym, stab))
.collect()
}
}

2
compiler/rustc_middle/src/mir/mono.rs
View file

@ -243,7 +243,7 @@ impl<'tcx> MonoItem<'tcx> {
/// Returns the item's `CrateNum`
pub fn krate(&self) -> CrateNum {
match self {
MonoItem::Fn(ref instance) => instance.def_id().krate,
MonoItem::Fn(instance) => instance.def_id().krate,
MonoItem::Static(def_id) => def_id.krate,
MonoItem::GlobalAsm(..) => LOCAL_CRATE,
}

2
compiler/rustc_middle/src/mir/pretty.rs
View file

@ -970,7 +970,7 @@ impl<'tcx> TerminatorKind<'tcx> {
}
FalseEdge { .. } => write!(fmt, "falseEdge"),
FalseUnwind { .. } => write!(fmt, "falseUnwind"),
InlineAsm { template, ref operands, options, .. } => {
InlineAsm { template, operands, options, .. } => {
write!(fmt, "asm!(\"{}\"", InlineAsmTemplatePiece::to_string(template))?;
for op in operands {
write!(fmt, ", ")?;

2
compiler/rustc_middle/src/mir/terminator.rs
View file

@ -226,7 +226,7 @@ impl<O> AssertKind<O> {
{
use AssertKind::*;
match self {
BoundsCheck { ref len, ref index } => write!(
BoundsCheck { len, index } => write!(
f,
"\"index out of bounds: the length is {{}} but the index is {{}}\", {len:?}, {index:?}"
),

6
compiler/rustc_middle/src/mir/visit.rs
View file

@ -443,7 +443,7 @@ macro_rules! make_mir_visitor {
location
)
}
StatementKind::Intrinsic(box ref $($mutability)? intrinsic) => {
StatementKind::Intrinsic(box intrinsic) => {
match intrinsic {
NonDivergingIntrinsic::Assume(op) => self.visit_operand(op, location),
NonDivergingIntrinsic::CopyNonOverlapping(CopyNonOverlapping {
@ -886,8 +886,8 @@ macro_rules! make_mir_visitor {
self.visit_source_info(source_info);
let location = Location::START;
if let Some(box VarDebugInfoFragment {
ref $($mutability)? ty,
ref $($mutability)? projection
ty,
projection
}) = composite {
self.visit_ty($(& $mutability)? *ty, TyContext::Location(location));
for elem in projection {

3
compiler/rustc_middle/src/thir.rs
View file

@ -678,8 +678,7 @@ impl<'tcx> Pat<'tcx> {
subpatterns.iter().for_each(|field| field.pattern.walk_(it))
}
Or { pats } => pats.iter().for_each(|p| p.walk_(it)),
Array { box ref prefix, ref slice, box ref suffix }
| Slice { box ref prefix, ref slice, box ref suffix } => {
Array { box prefix, slice, box suffix } | Slice { box prefix, slice, box suffix } => {
prefix.iter().chain(slice.as_deref()).chain(suffix.iter()).for_each(|p| p.walk_(it))
}
}

2
compiler/rustc_middle/src/thir/visit.rs
View file

@ -194,7 +194,7 @@ pub fn walk_stmt<'thir, 'tcx: 'thir, V: Visitor<'thir, 'tcx>>(
initializer,
remainder_scope: _,
init_scope: _,
ref pattern,
pattern,
lint_level: _,
else_block,
span: _,

12
compiler/rustc_middle/src/traits/mod.rs
View file

@ -144,14 +144,6 @@ impl<'tcx> ObligationCause<'tcx> {
}
}
#[derive(Clone, Debug, PartialEq, Eq, HashStable, TyEncodable, TyDecodable)]
#[derive(TypeVisitable, TypeFoldable)]
pub struct UnifyReceiverContext<'tcx> {
pub assoc_item: ty::AssocItem,
pub param_env: ty::ParamEnv<'tcx>,
pub args: GenericArgsRef<'tcx>,
}
/// A compact form of `ObligationCauseCode`.
#[derive(Clone, PartialEq, Eq, Default, HashStable)]
#[derive(TypeVisitable, TypeFoldable, TyEncodable, TyDecodable)]
@ -360,8 +352,6 @@ pub enum ObligationCauseCode<'tcx> {
/// Method receiver
MethodReceiver,
UnifyReceiver(Box<UnifyReceiverContext<'tcx>>),
/// `return` with no expression
ReturnNoExpression,
@ -786,7 +776,7 @@ impl DynCompatibilityViolation {
pub fn error_msg(&self) -> Cow<'static, str> {
match self {
DynCompatibilityViolation::SizedSelf(_) => "it requires `Self: Sized`".into(),
DynCompatibilityViolation::SupertraitSelf(ref spans) => {
DynCompatibilityViolation::SupertraitSelf(spans) => {
if spans.iter().any(|sp| *sp != DUMMY_SP) {
"it uses `Self` as a type parameter".into()
} else {

16
compiler/rustc_middle/src/ty/structural_impls.rs
View file

@ -447,23 +447,23 @@ impl<'tcx> TypeSuperVisitable<TyCtxt<'tcx>> for Ty<'tcx> {
}
ty::Slice(typ) => typ.visit_with(visitor),
ty::Adt(_, args) => args.visit_with(visitor),
ty::Dynamic(ref trait_ty, ref reg, _) => {
ty::Dynamic(trait_ty, reg, _) => {
try_visit!(trait_ty.visit_with(visitor));
reg.visit_with(visitor)
}
ty::Tuple(ts) => ts.visit_with(visitor),
ty::FnDef(_, args) => args.visit_with(visitor),
ty::FnPtr(ref sig_tys, _) => sig_tys.visit_with(visitor),
ty::UnsafeBinder(ref f) => f.visit_with(visitor),
ty::FnPtr(sig_tys, _) => sig_tys.visit_with(visitor),
ty::UnsafeBinder(f) => f.visit_with(visitor),
ty::Ref(r, ty, _) => {
try_visit!(r.visit_with(visitor));
ty.visit_with(visitor)
}
ty::Coroutine(_did, ref args) => args.visit_with(visitor),
ty::CoroutineWitness(_did, ref args) => args.visit_with(visitor),
ty::Closure(_did, ref args) => args.visit_with(visitor),
ty::CoroutineClosure(_did, ref args) => args.visit_with(visitor),
ty::Alias(_, ref data) => data.visit_with(visitor),
ty::Coroutine(_did, args) => args.visit_with(visitor),
ty::CoroutineWitness(_did, args) => args.visit_with(visitor),
ty::Closure(_did, args) => args.visit_with(visitor),
ty::CoroutineClosure(_did, args) => args.visit_with(visitor),
ty::Alias(_, data) => data.visit_with(visitor),
ty::Pat(ty, pat) => {
try_visit!(ty.visit_with(visitor));

Some files were not shown because too many files have changed in this diff Show more