From c4e99dd85d6bf9caf8469b019c1fc68d5c9a8a7b Mon Sep 17 00:00:00 2001
From: csmoe <35686186+csmoe@users.noreply.github.com>
Date: Sun, 13 May 2018 22:56:37 +0800
Subject: [PATCH] Revert "mark applicability"

This reverts commit a8809711285d2375ee98177f9e78090047514fb2.
---
 src/librustc/middle/liveness.rs                             | 6 ++----
 .../lint/issue-47390-unused-variable-in-struct-pattern.rs   | 1 -
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/librustc/middle/liveness.rs b/src/librustc/middle/liveness.rs
index 7d7417ab7e19..acdd5e6acad0 100644
--- a/src/librustc/middle/liveness.rs
+++ b/src/librustc/middle/liveness.rs
@@ -106,7 +106,6 @@ use self::LoopKind::*;
 use self::LiveNodeKind::*;
 use self::VarKind::*;
 
-use errors::Applicability;
 use hir::def::*;
 use ty::{self, TyCtxt};
 use lint;
@@ -1559,9 +1558,8 @@ impl<'a, 'tcx> Liveness<'a, 'tcx> {
                         err.span_suggestion(sp, "try ignoring the field",
                                             format!("{}: _", name));
                     } else {
-                        err.span_suggestion_with_applicability(
-                            sp, &suggest_underscore_msg,
-                            format!("_{}", name), Applicability::MachineApplicable);
+                        err.span_suggestion_short(sp, &suggest_underscore_msg,
+                                                  format!("_{}", name));
                     }
                     err.emit()
                 }
diff --git a/src/test/ui/lint/issue-47390-unused-variable-in-struct-pattern.rs b/src/test/ui/lint/issue-47390-unused-variable-in-struct-pattern.rs
index 28d304699002..100fb6d3533f 100644
--- a/src/test/ui/lint/issue-47390-unused-variable-in-struct-pattern.rs
+++ b/src/test/ui/lint/issue-47390-unused-variable-in-struct-pattern.rs
@@ -9,7 +9,6 @@
 // except according to those terms.
 
 // compile-pass
-// run-rustfix
 
 #![feature(box_syntax)]
 #![feature(box_patterns)]