Skip to content

Commit

Permalink
Auto merge of #13130 - nyurik:ref-lints, r=Centri3
Browse files Browse the repository at this point in the history
Avoid ref when using format!

Clean up a few minor refs in `format!` macro, as it has a performance cost. Apparently the compiler is unable to inline `format!("{}", &variable)`, and does a run-time double-reference instead (format macro already does one level referencing).

Inlining format args prevents accidental `&` misuse.

See also rust-lang/rust#112156

changelog: none
  • Loading branch information
bors committed Jul 26, 2024
2 parents 3504145 + 266abf3 commit 479491e
Show file tree
Hide file tree
Showing 6 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion clippy_lints/src/approx_const.rs
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ impl ApproxConstant {
cx,
APPROX_CONSTANT,
e.span,
format!("approximate value of `{module}::consts::{}` found", &name),
format!("approximate value of `{module}::consts::{name}` found"),
None,
"consider using the constant directly",
);
Expand Down
2 changes: 1 addition & 1 deletion clippy_lints/src/default.rs
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ impl<'tcx> LateLintPass<'tcx> for Default {
.map(ToString::to_string)
.collect::<Vec<_>>()
.join(", ");
format!("{adt_def_ty_name}::<{}>", &tys_str)
format!("{adt_def_ty_name}::<{tys_str}>")
} else {
binding_type.to_string()
};
Expand Down
2 changes: 1 addition & 1 deletion clippy_lints/src/methods/open_options.rs
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ fn check_open_options(cx: &LateContext<'_>, settings: &[(OpenOption, Argument, S
cx,
NONSENSICAL_OPEN_OPTIONS,
prev_span,
format!("the method `{}` is called more than once", &option),
format!("the method `{option}` is called more than once"),
);
}
}
Expand Down
2 changes: 1 addition & 1 deletion clippy_lints/src/methods/wrong_self_convention.rs
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ pub(super) fn check<'tcx>(
.collect::<Vec<_>>()
.join(" and ");

format!("methods with the following characteristics: ({})", &s)
format!("methods with the following characteristics: ({s})")
} else {
format!("methods called {}", &conventions[0])
}
Expand Down
2 changes: 1 addition & 1 deletion clippy_lints/src/no_effect.rs
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ fn check_unnecessary_operation(cx: &LateContext<'_>, stmt: &Stmt<'_>) {
}
let snippet =
if let (Some(arr), Some(func)) = (snippet_opt(cx, reduced[0].span), snippet_opt(cx, reduced[1].span)) {
format!("assert!({}.len() > {});", &arr, &func)
format!("assert!({arr}.len() > {func});")
} else {
return;
};
Expand Down
6 changes: 3 additions & 3 deletions clippy_lints/src/types/borrowed_box.rs
Original file line number Diff line number Diff line change
Expand Up @@ -48,15 +48,15 @@ pub(super) fn check(cx: &LateContext<'_>, hir_ty: &hir::Ty<'_>, lt: &Lifetime, m
let inner_snippet = snippet(cx, inner.span, "..");
let suggestion = match &inner.kind {
TyKind::TraitObject(bounds, lt_bound, _) if bounds.len() > 1 || !lt_bound.is_elided() => {
format!("&{ltopt}({})", &inner_snippet)
format!("&{ltopt}({inner_snippet})")
},
TyKind::Path(qpath)
if get_bounds_if_impl_trait(cx, qpath, inner.hir_id)
.map_or(false, |bounds| bounds.len() > 1) =>
{
format!("&{ltopt}({})", &inner_snippet)
format!("&{ltopt}({inner_snippet})")
},
_ => format!("&{ltopt}{}", &inner_snippet),
_ => format!("&{ltopt}{inner_snippet}"),
};
span_lint_and_sugg(
cx,
Expand Down

0 comments on commit 479491e

Please sign in to comment.