Remove another unused error variant

diff --git a/src/librustc/ich/impls_ty.rs b/src/librustc/ich/impls_ty.rs
index fe19196fe06ff336c3cd4ec0d77326b744b671fd..5e67065d1c13fcbf1656b29f3c2c54c596f55ac8 100644 (file)
--- a/src/librustc/ich/impls_ty.rs
+++ b/src/librustc/ich/impls_ty.rs
@@ -524,7 +524,6 @@ fn hash_stable<W: StableHasherResult>(&self,
         mem::discriminant(self).hash_stable(hcx, hasher);
 
         match *self {
-            NonConstPath |
             TypeckError |
             CouldNotResolve |
             CheckMatchError => {

diff --git a/src/librustc/middle/const_val.rs b/src/librustc/middle/const_val.rs
index 3abe405d598468782b6ec44527293f4c1ae1f5a5..88275b3c18cc1172f83fd736a02c362d129e52f3 100644 (file)
--- a/src/librustc/middle/const_val.rs
+++ b/src/librustc/middle/const_val.rs
@@ -39,7 +39,6 @@ pub struct ConstEvalErr<'tcx> {
 #[derive(Clone, Debug, RustcEncodable, RustcDecodable)]
 pub enum ErrKind<'tcx> {
 
-    NonConstPath,
     CouldNotResolve,
     TypeckError,
     CheckMatchError,
@@ -82,7 +81,6 @@ macro_rules! simple {
         }
 
         match *self.kind {
-            NonConstPath        => simple!("non-constant path in constant expression"),
             CouldNotResolve => simple!("could not resolve"),
             TypeckError => simple!("type-checking failed"),
             CheckMatchError => simple!("match-checking failed"),

diff --git a/src/librustc/ty/structural_impls.rs b/src/librustc/ty/structural_impls.rs
index 2055f11f9f8af1750e38332174de12ef7501e451..79a6311185076a0b5366661722871d48ba463b25 100644 (file)
--- a/src/librustc/ty/structural_impls.rs
+++ b/src/librustc/ty/structural_impls.rs
@@ -594,7 +594,6 @@ fn lift_to_tcx<'b, 'gcx>(&self, tcx: TyCtxt<'b, 'gcx, 'tcx>) -> Option<Self::Lif
         use middle::const_val::ErrKind::*;
 
         Some(match *self {
-            NonConstPath => NonConstPath,
             CouldNotResolve => CouldNotResolve,
             TypeckError => TypeckError,
             CheckMatchError => CheckMatchError,