simplify span_to_remove

Author: ada4a

clippy_lints/src/let_with_type_underscore.rs

@@ -1,6 +1,5 @@
 use clippy_utils::diagnostics::span_lint_and_then;
 use clippy_utils::is_from_proc_macro;
-use clippy_utils::source::{IntoSpan, SpanRangeExt};
 use rustc_ast::{Local, TyKind};
 use rustc_errors::Applicability;
 use rustc_lint::{EarlyContext, EarlyLintPass, LintContext};
@@ -35,19 +34,14 @@ impl EarlyLintPass for UnderscoreTyped {
             && !local.span.in_external_macro(sm)
             && !is_from_proc_macro(cx, &**ty)
         {
-            let span_to_remove = sm
-                .span_extend_to_prev_char_before(ty.span, ':', true)
-                .with_leading_whitespace(cx)
-                .into_span();
-
             span_lint_and_then(
                 cx,
                 LET_WITH_TYPE_UNDERSCORE,
                 local.span,
                 "variable declared with type underscore",
                 |diag| {
                     diag.span_suggestion_verbose(
-                        span_to_remove,
+                        ty.span.with_lo(local.pat.span.hi()),
                         "remove the explicit type `_` declaration",
                         "",
                         Applicability::MachineApplicable,