about summary refs log tree commit diff
diff options
context:
space:
mode:
authorcsmoe <35686186+csmoe@users.noreply.github.com>2018-05-13 22:56:37 +0800
committercsmoe <35686186+csmoe@users.noreply.github.com>2018-05-13 22:56:37 +0800
commitc4e99dd85d6bf9caf8469b019c1fc68d5c9a8a7b (patch)
tree24270f6ed6704c09c8a2bb5e203ca68e1467df32
parenta8809711285d2375ee98177f9e78090047514fb2 (diff)
downloadrust-c4e99dd85d6bf9caf8469b019c1fc68d5c9a8a7b.tar.gz
rust-c4e99dd85d6bf9caf8469b019c1fc68d5c9a8a7b.zip
Revert "mark applicability"
This reverts commit a8809711285d2375ee98177f9e78090047514fb2.
-rw-r--r--src/librustc/middle/liveness.rs6
-rw-r--r--src/test/ui/lint/issue-47390-unused-variable-in-struct-pattern.rs1
2 files changed, 2 insertions, 5 deletions
diff --git a/src/librustc/middle/liveness.rs b/src/librustc/middle/liveness.rs
index 7d7417ab7e1..acdd5e6acad 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 28d30469900..100fb6d3533 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)]