about summary refs log tree commit diff
path: root/src/librustc/mir
diff options
context:
space:
mode:
authorRalf Jung <post@ralfj.de>2018-08-26 14:22:59 +0200
committerRalf Jung <post@ralfj.de>2018-08-28 19:57:05 +0200
commitf96208ca5bd34ba5e9106fe6527db43a9bdc3a8f (patch)
tree18857fb568c05f46f5b242ce3782c5103accb457 /src/librustc/mir
parent6c78fa822a311e30e6421525570f472bf19e32fd (diff)
downloadrust-f96208ca5bd34ba5e9106fe6527db43a9bdc3a8f.tar.gz
rust-f96208ca5bd34ba5e9106fe6527db43a9bdc3a8f.zip
address nits
Diffstat (limited to 'src/librustc/mir')
-rw-r--r--src/librustc/mir/interpret/error.rs8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/librustc/mir/interpret/error.rs b/src/librustc/mir/interpret/error.rs
index c62ed841866..ab38f8fa721 100644
--- a/src/librustc/mir/interpret/error.rs
+++ b/src/librustc/mir/interpret/error.rs
@@ -190,7 +190,7 @@ pub enum EvalErrorKind<'tcx, O> {
     InvalidMemoryAccess,
     InvalidFunctionPointer,
     InvalidBool,
-    InvalidDiscriminant,
+    InvalidDiscriminant(u128),
     PointerOutOfBounds {
         ptr: Pointer,
         access: bool,
@@ -302,8 +302,8 @@ impl<'tcx, O> EvalErrorKind<'tcx, O> {
                 "tried to use a function pointer after offsetting it",
             InvalidBool =>
                 "invalid boolean value read",
-            InvalidDiscriminant =>
-                "invalid enum discriminant value read or written",
+            InvalidDiscriminant(..) =>
+                "invalid enum discriminant value read",
             PointerOutOfBounds { .. } =>
                 "pointer offset outside bounds of allocation",
             InvalidNullPointerUsage =>
@@ -488,6 +488,8 @@ impl<'tcx, O: fmt::Debug> fmt::Debug for EvalErrorKind<'tcx, O> {
                        align {}", size.bytes(), align.abi(), size2.bytes(), align2.abi()),
             Panic { ref msg, line, col, ref file } =>
                 write!(f, "the evaluated program panicked at '{}', {}:{}:{}", msg, file, line, col),
+            InvalidDiscriminant(val) =>
+                write!(f, "encountered invalid enum discriminant {}", val),
             _ => write!(f, "{}", self.description()),
         }
     }