Implement suggestion in on lint

Author: b-NC

clippy_lints/src/methods/err_expect.rs

@@ -1,13 +1,15 @@
 use super::ERR_EXPECT;
-use clippy_utils::{diagnostics::span_lint_and_help, meets_msrv, msrvs, ty::is_type_diagnostic_item};
+use clippy_utils::{meets_msrv, msrvs, ty::is_type_diagnostic_item};
+use clippy_utils::diagnostics::span_lint_and_sugg;
 use clippy_utils::ty::implements_trait;
+use rustc_errors::Applicability;
 use rustc_lint::LateContext;
 use rustc_middle::ty;
 use rustc_middle::ty::Ty;
 use rustc_semver::RustcVersion;
-use rustc_span::sym;
+use rustc_span::{Span, sym};
 
-pub(super) fn check(cx: &LateContext<'_>, expr: &rustc_hir::Expr<'_>, recv: &rustc_hir::Expr<'_>, msrv: Option<&RustcVersion>) {
+pub(super) fn check(cx: &LateContext<'_>, _expr: &rustc_hir::Expr<'_>, recv: &rustc_hir::Expr<'_>, msrv: Option<&RustcVersion>, span: Span) {
     if_chain! {
         if is_type_diagnostic_item(cx, cx.typeck_results().expr_ty(recv), sym::Result);
         if meets_msrv(msrv, &msrvs::EXPECT_ERR);
@@ -17,16 +19,17 @@ pub(super) fn check(cx: &LateContext<'_>, expr: &rustc_hir::Expr<'_>, recv: &rus
         if has_debug_impl(error_type, cx);
 
         then {
-                    span_lint_and_help(
+                    span_lint_and_sugg(
             cx,
             ERR_EXPECT,
-            expr.span,
+            span,
             "called `.err().expect()` on a `Result` value",
-            None,
-            "`.expect_err()` can be called instead",
+            "try",
+                "expect_err".to_string(),
+                Applicability::MachineApplicable
         );
         }
-    }
+    };
 }
 
 /// Given a `Result<T, E>` type, return its error type (`E`).

clippy_lints/src/methods/mod.rs

@@ -2453,7 +2453,7 @@ fn check_methods<'tcx>(cx: &LateContext<'tcx>, expr: &'tcx Expr<'_>, msrv: Optio
             },
             ("expect", [_]) => match method_call(recv) {
                 Some(("ok", [recv], _)) => ok_expect::check(cx, expr, recv),
-                Some(("err", [recv], _)) => err_expect::check(cx, expr, recv, msrv),
+                Some(("err", [recv], span)) => err_expect::check(cx, expr, recv, msrv, span),
                 _ => expect_used::check(cx, expr, recv),
             },