nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-24 07:44:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Extracting arguments to format to pass directly to panic when appropriate

Browse Source
This commit is contained in:
Donald Robertson 2018-06-05 21:15:08 +01:00
parent 32404741c6
commit 451fd5feb9
2 changed files with 41 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
clippy_lints/src/methods.rs
View File

@ -1022,9 +1022,47 @@ fn lint_expect_fun_call(cx: &LateContext, expr: &hir::Expr, method_span: Span, n
}
let closure = if match_type(cx, self_type, &paths::OPTION) { "||" } else { "|_|" };
let span_replace_word = method_span.with_hi(span.hi());
if let hir::ExprAddrOf(_, ref addr_of) = arg.node {
if let hir::ExprCall(ref _inner_fun, ref inner_args) = addr_of.node {
// TODO: check if inner_fun is call to format!
if inner_args.len() == 1 {
if let hir::ExprCall(_, ref format_args) = inner_args[0].node {
let args_len = format_args.len();
let args: Vec<String> = format_args
.into_iter()
.take(args_len - 1)
.map(|a| {
if let hir::ExprAddrOf(_, ref format_arg) = a.node {
if let hir::ExprMatch(ref format_arg_expr, _, _) = format_arg.node {
if let hir::ExprTup(ref format_arg_expr_tup) = format_arg_expr.node {
return snippet(cx, format_arg_expr_tup[0].span, "..").into_owned();
}
}
};
snippet(cx, a.span, "..").into_owned()
})
.collect();
let sugg = args.join(", ");
span_lint_and_sugg(
cx,
EXPECT_FUN_CALL,
span_replace_word,
&format!("use of `{}` followed by a function call", name),
"try this",
format!("unwrap_or_else({} panic!({}))", closure, sugg),
);
return;
}
}
}
}
let sugg: Cow<_> = snippet(cx, arg.span, "..");
let span_replace_word = method_span.with_hi(span.hi());
span_lint_and_sugg(
cx,

4
tests/ui/methods.stderr
View File

@ -427,7 +427,7 @@ error: use of `expect` followed by a function call
--> $DIR/methods.rs:365:26
|
365 | with_none_and_format.expect(&format!("Error {}: fake error", error_code));
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try this: `unwrap_or_else(|| panic!(&format!("Error {}: fake error", error_code)))`
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try this: `unwrap_or_else(|| panic!("Error {}: fake error", error_code))`
|
= note: `-D expect-fun-call` implied by `-D warnings`
@ -441,7 +441,7 @@ error: use of `expect` followed by a function call
--> $DIR/methods.rs:378:25
|
378 | with_err_and_format.expect(&format!("Error {}: fake error", error_code));
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try this: `unwrap_or_else(|_| panic!(&format!("Error {}: fake error", error_code)))`
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: try this: `unwrap_or_else(|_| panic!("Error {}: fake error", error_code))`
error: use of `expect` followed by a function call
--> $DIR/methods.rs:381:25