Have the drop code suggestion not include `let _ =`

diff --git a/compiler/rustc_lint/src/let_underscore.rs b/compiler/rustc_lint/src/let_underscore.rs
index fe0e0511f6b49dc784a0ff9502e4579c0da4a8d6..2ba79aacace835202cf9f3875e2b2e489518d47d 100644 (file)
--- a/compiler/rustc_lint/src/let_underscore.rs
+++ b/compiler/rustc_lint/src/let_underscore.rs
@@ -157,7 +157,7 @@ fn build_and_emit_lint(
         .multipart_suggestion(
             "consider immediately dropping the value",
             vec![
-                (init_span.shrink_to_lo(), "drop(".to_string()),
+                (local.span.until(init_span), "drop(".to_string()),
                 (init_span.shrink_to_hi(), ")".to_string()),
             ],
             Applicability::MachineApplicable,

diff --git a/src/test/ui/lint/let_underscore/let_underscore_drop.stderr b/src/test/ui/lint/let_underscore/let_underscore_drop.stderr
index b6ff9d1a27cd81cbce1c556eaadede26add32883..cf7b882e946d9be5b55d127e591fd85f2c0981c2 100644 (file)
--- a/src/test/ui/lint/let_underscore/let_underscore_drop.stderr
+++ b/src/test/ui/lint/let_underscore/let_underscore_drop.stderr
@@ -11,8 +11,8 @@ LL |     let _unused = NontrivialDrop;
    |         ~~~~~~~
 help: consider immediately dropping the value
    |
-LL |     let _ = drop(NontrivialDrop);
-   |             +++++              +
+LL |     drop(NontrivialDrop);
+   |     ~~~~~              +
 
 warning: 1 warning emitted
 

diff --git a/src/test/ui/lint/let_underscore/let_underscore_lock.stderr b/src/test/ui/lint/let_underscore/let_underscore_lock.stderr
index 1e49b89c5a8748346a054b4eec66ad5d74862292..7aa119003b4bab941e356c363e08fc7fe215d20c 100644 (file)
--- a/src/test/ui/lint/let_underscore/let_underscore_lock.stderr
+++ b/src/test/ui/lint/let_underscore/let_underscore_lock.stderr
@@ -11,8 +11,8 @@ LL |     let _unused = data.lock().unwrap();
    |         ~~~~~~~
 help: consider immediately dropping the value
    |
-LL |     let _ = drop(data.lock().unwrap());
-   |             +++++                    +
+LL |     drop(data.lock().unwrap());
+   |     ~~~~~                    +
 
 error: aborting due to previous error