From: Yuki OKUSHI <huyuumi.dev@gmail.com>
Date: Thu, 28 Mar 2019 19:42:03 +0000 (+0900)
Subject: Use ErrorReported
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=07788478332d645293a81686d5d225b8aafabe90;p=rust.git

Use ErrorReported
---

diff --git a/src/librustc_mir/const_eval.rs b/src/librustc_mir/const_eval.rs
index 1c3f7882b9f..2268568c5f8 100644
--- a/src/librustc_mir/const_eval.rs
+++ b/src/librustc_mir/const_eval.rs
@@ -14,6 +14,7 @@
 use rustc::ty::layout::{self, LayoutOf, VariantIdx};
 use rustc::ty::subst::Subst;
 use rustc::traits::Reveal;
+use rustc::util::common::ErrorReported;
 use rustc_data_structures::fx::FxHashMap;
 
 use syntax::ast::Mutability;
@@ -654,7 +655,7 @@ pub fn const_eval_raw_provider<'a, 'tcx>(
                                         v));
                     v
                 },
-                Err(_) => ErrorHandled::Reported,
+                Err(ErrorReported) => ErrorHandled::Reported,
             }
         } else if def_id.is_local() {
             // constant defined in this crate, we can figure out a lint level!