about summary refs log tree commit diff
diff options
context:
space:
mode:
authorOliver Schneider <github35764891676564198441@oli-obk.de>2018-06-05 19:06:29 +0200
committerOliver Schneider <github35764891676564198441@oli-obk.de>2018-06-05 20:49:47 +0200
commit5950496c92f99d15d85432c0c0eace5fb6b25c02 (patch)
tree8cc6cf182087396477d874a0e97928fab7c40350
parent848080dc42a0080fc4dc1d29556aaddbbc3e5bd5 (diff)
downloadrust-5950496c92f99d15d85432c0c0eace5fb6b25c02.tar.gz
rust-5950496c92f99d15d85432c0c0eace5fb6b25c02.zip
Remove another unused error variant
-rw-r--r--src/librustc/ich/impls_ty.rs1
-rw-r--r--src/librustc/middle/const_val.rs2
-rw-r--r--src/librustc/ty/structural_impls.rs1
3 files changed, 0 insertions, 4 deletions
diff --git a/src/librustc/ich/impls_ty.rs b/src/librustc/ich/impls_ty.rs
index fe19196fe06..5e67065d1c1 100644
--- a/src/librustc/ich/impls_ty.rs
+++ b/src/librustc/ich/impls_ty.rs
@@ -524,7 +524,6 @@ for ::middle::const_val::ErrKind<'gcx> {
         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 3abe405d598..88275b3c18c 100644
--- 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 @@ impl<'a, 'gcx, 'tcx> ConstEvalErr<'tcx> {
         }
 
         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 2055f11f9f8..79a63111850 100644
--- a/src/librustc/ty/structural_impls.rs
+++ b/src/librustc/ty/structural_impls.rs
@@ -594,7 +594,6 @@ impl<'a, 'tcx> Lift<'tcx> for const_val::ErrKind<'a> {
         use middle::const_val::ErrKind::*;
 
         Some(match *self {
-            NonConstPath => NonConstPath,
             CouldNotResolve => CouldNotResolve,
             TypeckError => TypeckError,
             CheckMatchError => CheckMatchError,