wip

Author: nyurik

compiler/rustc_ast_lowering/src/lib.rs

@@ -1607,7 +1607,7 @@ impl<'a, 'hir> LoweringContext<'a, 'hir> {
                         "Unexpected lifetime resolution {:?} for {:?} at {:?}",
                         res, lifetime.ident, lifetime.ident.span
                     );
-                    span_bug!(lifetime.ident.span, "{}", bug_msg);
+                    span_bug!(lifetime.ident.span, "{bug_msg}");
                 }
             };
 

compiler/rustc_ast_lowering/src/lifetime_collector.rs

@@ -38,7 +38,7 @@ impl<'ast> LifetimeCollectVisitor<'ast> {
                     "Unexpected lifetime resolution {:?} for {:?} at {:?}",
                     res, lifetime.ident, lifetime.ident.span
                 );
-                span_bug!(lifetime.ident.span, "{}", bug_msg);
+                span_bug!(lifetime.ident.span, "{bug_msg}");
             }
         }
     }

compiler/rustc_borrowck/src/constraint_generation.rs

@@ -71,7 +71,7 @@ impl<'cg, 'tcx> Visitor<'tcx> for ConstraintGeneration<'cg, 'tcx> {
             | TyContext::YieldTy(SourceInfo { span, .. })
             | TyContext::UserTy(span)
             | TyContext::LocalDecl { source_info: SourceInfo { span, .. }, .. } => {
-                span_bug!(span, "should not be visiting outside of the CFG: {:?}", ty_context);
+                span_bug!(span, "should not be visiting outside of the CFG: {ty_context:?}");
             }
             TyContext::Location(location) => {
                 self.add_regular_live_constraint(ty, location);

compiler/rustc_builtin_macros/src/assert/context.rs

@@ -159,7 +159,7 @@ impl<'cx, 'a> Context<'cx, 'a> {
                     } else {
                         format!(
                             "Assertion failed: {escaped_expr_str}\nWith captures:\n{}",
-                            &self.fmt_string
+                            self.fmt_string
                         )
                     }),
                     suffix: None,

compiler/rustc_codegen_cranelift/src/common.rs

@@ -480,7 +480,7 @@ impl<'tcx> LayoutOfHelpers<'tcx> for RevealAllLayoutCx<'tcx> {
         if let LayoutError::SizeOverflow(_) | LayoutError::ReferencesError(_) = err {
             self.0.sess.span_fatal(span, err.to_string())
         } else {
-            span_bug!(span, "failed to get layout for `{}`: {}", ty, err)
+            span_bug!(span, "failed to get layout for `{ty}`: {err}")
         }
     }
 }

compiler/rustc_codegen_cranelift/src/constant.rs

@@ -107,7 +107,7 @@ pub(crate) fn eval_mir_constant<'tcx>(
                 fx.tcx.sess.span_err(constant.span, "erroneous constant encountered");
             }
             ErrorHandled::TooGeneric => {
-                span_bug!(constant.span, "codegen encountered polymorphic constant: {:?}", err);
+                span_bug!(constant.span, "codegen encountered polymorphic constant: {err:?}");
             }
         })
         .ok();

compiler/rustc_codegen_gcc/src/context.rs

@@ -479,7 +479,7 @@ impl<'gcc, 'tcx> LayoutOfHelpers<'tcx> for CodegenCx<'gcc, 'tcx> {
         if let LayoutError::SizeOverflow(_) | LayoutError::ReferencesError(_) = err {
             self.sess().emit_fatal(respan(span, err.into_diagnostic()))
         } else {
-            span_bug!(span, "failed to get layout for `{}`: {}", ty, err)
+            span_bug!(span, "failed to get layout for `{ty}`: {err}")
         }
     }
 }

compiler/rustc_codegen_ssa/src/back/link.rs

@@ -971,7 +971,7 @@ fn link_natively<'a>(
                 sess.emit_err(errors::UnableToExeLinker {
                     linker_path,
                     error: e,
-                    command_formatted: format!("{:?}", &cmd),
+                    command_formatted: format!("{cmd:?}"),
                 });
             }
 
@@ -1477,7 +1477,7 @@ fn print_native_static_libs(
                 sess.emit_note(errors::StaticLibraryNativeArtifacts);
                 // Prefix for greppability
                 // Note: This must not be translated as tools are allowed to depend on this exact string.
-                sess.note_without_error(format!("native-static-libs: {}", &lib_args.join(" ")));
+                sess.note_without_error(format!("native-static-libs: {}", lib_args.join(" ")));
             }
         }
     }

compiler/rustc_codegen_ssa/src/codegen_attrs.rs

@@ -313,7 +313,7 @@ fn codegen_fn_attrs(tcx: TyCtxt<'_>, did: LocalDefId) -> CodegenFnAttrs {
             sym::link_section => {
                 if let Some(val) = attr.value_str() {
                     if val.as_str().bytes().any(|b| b == 0) {
-                        let msg = format!("illegal null byte in link_section value: `{}`", &val);
+                        let msg = format!("illegal null byte in link_section value: `{val}`");
                         tcx.sess.span_err(attr.span, msg);
                     } else {
                         codegen_fn_attrs.link_section = Some(val);
@@ -648,7 +648,7 @@ fn check_link_ordinal(tcx: TyCtxt<'_>, attr: &ast::Attribute) -> Option<u16> {
         if *ordinal <= u16::MAX as u128 {
             Some(*ordinal as u16)
         } else {
-            let msg = format!("ordinal value in `link_ordinal` is too large: `{}`", &ordinal);
+            let msg = format!("ordinal value in `link_ordinal` is too large: `{ordinal}`");
             tcx.sess
                 .struct_span_err(attr.span, msg)
                 .note("the value may not exceed `u16::MAX`")

compiler/rustc_codegen_ssa/src/common.rs

@@ -198,7 +198,7 @@ pub fn asm_const_to_str<'tcx>(
     ty_and_layout: TyAndLayout<'tcx>,
 ) -> String {
     let ConstValue::Scalar(scalar) = const_value else {
-        span_bug!(sp, "expected Scalar for promoted asm const, but got {:#?}", const_value)
+        span_bug!(sp, "expected Scalar for promoted asm const, but got {const_value:#?}")
     };
     let value = scalar.assert_bits(ty_and_layout.size);
     match ty_and_layout.ty.kind() {