Conform names

diff --git a/src/librustc/ich/impls_ty.rs b/src/librustc/ich/impls_ty.rs
index 9ff4d53e09aaeab20dfc7957ce167ff3a86b1fb7..9609ae5a0beb855bfd906627845a6e4915f9c4a8 100644 (file)
--- a/src/librustc/ich/impls_ty.rs
+++ b/src/librustc/ich/impls_ty.rs
@@ -372,7 +372,7 @@ fn hash_stable<W: StableHasherResult>(&self,
             MiscCatchAll |
             IndexOpFeatureGated |
             TypeckError |
-            MatchCheckError => {
+            CheckMatchError => {
                 // nothing to do
             }
             UnimplementedConstVal(s) => {

diff --git a/src/librustc/middle/const_val.rs b/src/librustc/middle/const_val.rs
index f7870bd8e2495056add45a336e4bc015db1c9204..440af39a0d4695ca72c61c8d53c199726cc199db 100644 (file)
--- a/src/librustc/middle/const_val.rs
+++ b/src/librustc/middle/const_val.rs
@@ -107,7 +107,7 @@ pub enum ErrKind<'tcx> {
     ErroneousReferencedConstant(Box<ConstEvalErr<'tcx>>),
 
     TypeckError,
-    MatchCheckError,
+    CheckMatchError,
 }
 
 impl<'tcx> From<ConstMathErr> for ErrKind<'tcx> {
@@ -169,7 +169,7 @@ macro_rules! simple {
             ErroneousReferencedConstant(_) => simple!("could not evaluate referenced constant"),
 
             TypeckError => simple!("type-checking failed"),
-            MatchCheckError => simple!("match-checking failed"),
+            CheckMatchError => simple!("match-checking failed"),
         }
     }
 
@@ -215,7 +215,7 @@ pub fn report(&self,
         primary_kind: &str)
     {
         match self.kind {
-            ErrKind::TypeckError | ErrKind::MatchCheckError => return,
+            ErrKind::TypeckError | ErrKind::CheckMatchError => return,
             _ => {}
         }
         self.struct_error(tcx, primary_span, primary_kind).emit();

diff --git a/src/librustc/ty/structural_impls.rs b/src/librustc/ty/structural_impls.rs
index 0e3870c58e58f10748b1ba7d060778b35fbd9622..08152942379178ffc4fb36b03935b06844576052 100644 (file)
--- a/src/librustc/ty/structural_impls.rs
+++ b/src/librustc/ty/structural_impls.rs
@@ -477,7 +477,7 @@ fn lift_to_tcx<'b, 'gcx>(&self, tcx: TyCtxt<'b, 'gcx, 'tcx>) -> Option<Self::Lif
             }
 
             TypeckError => TypeckError,
-            MatchCheckError => MatchCheckError,
+            CheckMatchError => CheckMatchError,
         })
     }
 }

diff --git a/src/librustc_const_eval/eval.rs b/src/librustc_const_eval/eval.rs
index b4b12e994c8f9822387da0035dc6e8c47541799c..eb4db6365cc57ee7e55a89fd62808e827085724d 100644 (file)
--- a/src/librustc_const_eval/eval.rs
+++ b/src/librustc_const_eval/eval.rs
@@ -703,7 +703,7 @@ pub(crate) fn const_eval<'a, 'tcx>(tcx: TyCtxt<'a, 'tcx, 'tcx>,
         if tcx.check_match(def_id).is_err() {
             return Err(ConstEvalErr {
                 span: tcx.def_span(key.value.0),
-                kind: MatchCheckError,
+                kind: CheckMatchError,
             });
         }