about summary refs log tree commit diff
diff options
context:
space:
mode:
authorChristopher Vittal <christopher.vittal@gmail.com>2019-03-25 09:16:12 -0400
committerChristopher Vittal <christopher.vittal@gmail.com>2019-05-02 15:36:30 -0400
commit2a0426c2695e1a22c37b5ce039fb0febeb8b8f6b (patch)
tree41ef80bcefd4304433ab7e34fae3b7cdcba1848f
parent7da9eeeaa7e3095420c24377d9ad612b8ad321ed (diff)
downloadrust-2a0426c2695e1a22c37b5ce039fb0febeb8b8f6b.tar.gz
rust-2a0426c2695e1a22c37b5ce039fb0febeb8b8f6b.zip
Stub display impl for Origin
-rw-r--r--src/librustc_mir/util/borrowck_errors.rs24
1 files changed, 4 insertions, 20 deletions
diff --git a/src/librustc_mir/util/borrowck_errors.rs b/src/librustc_mir/util/borrowck_errors.rs
index bf3cdf4abf7..4563c9f18a3 100644
--- a/src/librustc_mir/util/borrowck_errors.rs
+++ b/src/librustc_mir/util/borrowck_errors.rs
@@ -12,26 +12,10 @@ pub enum Origin {
 }
 
 impl fmt::Display for Origin {
-    fn fmt(&self, w: &mut fmt::Formatter<'_>) -> fmt::Result {
-        // If the user passed `-Z borrowck=compare`, then include
-        // origin info as part of the error report,
-        // otherwise
-        let display_origin = ty::tls::with_opt(|opt_tcx| {
-            if let Some(tcx) = opt_tcx {
-                tcx.sess.opts.borrowck_mode == BorrowckMode::Compare
-            } else {
-                false
-            }
-        });
-        if display_origin {
-            match *self {
-                Origin::Mir => write!(w, " (Mir)"),
-                Origin::Ast => write!(w, " (Ast)"),
-            }
-        } else {
-            // Print no origin info
-            Ok(())
-        }
+    fn fmt(&self, _w: &mut fmt::Formatter<'_>) -> fmt::Result {
+        // FIXME(chrisvittal) remove Origin entirely
+        // Print no origin info
+        Ok(())
     }
 }