mirror of
https://github.com/rust-lang/rust-clippy
synced 2025-02-17 06:28:42 +00:00
Fix regression with format!
This commit is contained in:
parent
bc76f397c6
commit
cae9cedeb5
2 changed files with 28 additions and 13 deletions
|
@ -50,8 +50,9 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for Pass {
|
||||||
let Some(fun_def_id) = opt_def_id(resolve_node(cx, qpath, fun.hir_id)),
|
let Some(fun_def_id) = opt_def_id(resolve_node(cx, qpath, fun.hir_id)),
|
||||||
match_def_path(cx.tcx, fun_def_id, &paths::FMT_ARGUMENTS_NEWV1),
|
match_def_path(cx.tcx, fun_def_id, &paths::FMT_ARGUMENTS_NEWV1),
|
||||||
// ensure the format string is `"{..}"` with only one argument and no text
|
// ensure the format string is `"{..}"` with only one argument and no text
|
||||||
check_static_str(cx, &args[0]),
|
check_static_str(&args[0]),
|
||||||
// ensure the format argument is `{}` ie. Display with no fancy option
|
// ensure the format argument is `{}` ie. Display with no fancy option
|
||||||
|
// and that the argument is a string
|
||||||
check_arg_is_display(cx, &args[1])
|
check_arg_is_display(cx, &args[1])
|
||||||
], {
|
], {
|
||||||
span_lint(cx, USELESS_FORMAT, span, "useless use of `format!`");
|
span_lint(cx, USELESS_FORMAT, span, "useless use of `format!`");
|
||||||
|
@ -96,17 +97,19 @@ pub fn get_argument_fmtstr_parts<'a, 'b>(cx: &LateContext<'a, 'b>, expr: &'a Exp
|
||||||
None
|
None
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Checks if the expressions matches
|
/// Checks if the expressions matches `&[""]`
|
||||||
/// ```rust, ignore
|
fn check_static_str(expr: &Expr) -> bool {
|
||||||
/// { static __STATIC_FMTSTR: &'static[&'static str] = &["a", "b", c];
|
if_let_chain! {[
|
||||||
/// __STATIC_FMTSTR }
|
let ExprAddrOf(_, ref expr) = expr.node, // &[""]
|
||||||
/// ```
|
let ExprArray(ref exprs) = expr.node, // [""]
|
||||||
fn check_static_str(cx: &LateContext, expr: &Expr) -> bool {
|
exprs.len() == 1,
|
||||||
if let Some(expr) = get_argument_fmtstr_parts(cx, expr) {
|
let ExprLit(ref lit) = exprs[0].node,
|
||||||
expr.len() == 1 && expr[0].is_empty()
|
let LitKind::Str(ref lit, _) = lit.node,
|
||||||
} else {
|
], {
|
||||||
false
|
return lit.as_str().is_empty();
|
||||||
}
|
}}
|
||||||
|
|
||||||
|
false
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Checks if the expressions matches
|
/// Checks if the expressions matches
|
||||||
|
|
|
@ -6,5 +6,17 @@ error: useless use of `format!`
|
||||||
|
|
|
|
||||||
= note: `-D useless-format` implied by `-D warnings`
|
= note: `-D useless-format` implied by `-D warnings`
|
||||||
|
|
||||||
error: aborting due to previous error
|
error: useless use of `format!`
|
||||||
|
--> $DIR/format.rs:8:5
|
||||||
|
|
|
||||||
|
8 | format!("{}", "foo");
|
||||||
|
| ^^^^^^^^^^^^^^^^^^^^^
|
||||||
|
|
||||||
|
error: useless use of `format!`
|
||||||
|
--> $DIR/format.rs:15:5
|
||||||
|
|
|
||||||
|
15 | format!("{}", arg);
|
||||||
|
| ^^^^^^^^^^^^^^^^^^^
|
||||||
|
|
||||||
|
error: aborting due to 3 previous errors
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue