use clippy_utils::diagnostics::span_lint_and_sugg;
use clippy_utils::macros::{find_assert_args, root_macro_call_first_node, PanicExpn};
-use clippy_utils::path_res;
use clippy_utils::source::snippet_with_context;
use clippy_utils::ty::{implements_trait, is_copy, is_type_diagnostic_item};
use clippy_utils::usage::local_used_after_expr;
+use clippy_utils::{is_expr_final_block_expr, path_res};
use rustc_errors::Applicability;
use rustc_hir::def::Res;
use rustc_hir::{Expr, ExprKind};
return;
}
}
+ let semicolon = if is_expr_final_block_expr(cx.tcx, e) {";"} else {""};
let mut app = Applicability::MachineApplicable;
match method_segment.ident.as_str() {
"is_ok" if type_suitable_to_unwrap(cx, substs.type_at(1)) => {
"called `assert!` with `Result::is_ok`",
"replace with",
format!(
- "{}.unwrap()",
- snippet_with_context(cx, recv.span, condition.span.ctxt(), "..", &mut app).0
+ "{}.unwrap(){}",
+ snippet_with_context(cx, recv.span, condition.span.ctxt(), "..", &mut app).0,
+ semicolon
),
app,
);
"called `assert!` with `Result::is_err`",
"replace with",
format!(
- "{}.unwrap_err()",
- snippet_with_context(cx, recv.span, condition.span.ctxt(), "..", &mut app).0
+ "{}.unwrap_err(){}",
+ snippet_with_context(cx, recv.span, condition.span.ctxt(), "..", &mut app).0,
+ semicolon
),
app,
);
LL | assert!(r.is_err());
| ^^^^^^^^^^^^^^^^^^^ help: replace with: `r.unwrap_err()`
-error: aborting due to 6 previous errors
+error: called `assert!` with `Result::is_err`
+ --> $DIR/assertions_on_result_states.rs:82:5
+ |
+LL | assert!(res.is_err())
+ | ^^^^^^^^^^^^^^^^^^^^^ help: replace with: `res.unwrap_err();`
+
+error: aborting due to 7 previous errors