From 870bb4d862ee3c5b23cb428e7a697a13917ec8d8 Mon Sep 17 00:00:00 2001
From: Scott Olson <scott@solson.me>
Date: Wed, 28 Sep 2016 11:48:43 -0600
Subject: [PATCH] Reword inline assembly error.

---
 src/error.rs           | 6 +++---
 src/interpreter/mod.rs | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/error.rs b/src/error.rs
index cee5d7d26906..44179eafabba 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -45,7 +45,7 @@ pub enum EvalError<'tcx> {
     VtableForArgumentlessMethod,
     ModifiedConstantMemory,
     AssumptionNotHeld,
-    Assembler,
+    InlineAsm,
 }
 
 pub type EvalResult<'tcx, T> = Result<T, EvalError<'tcx>>;
@@ -104,8 +104,8 @@ impl<'tcx> Error for EvalError<'tcx> {
                 "tried to modify constant memory",
             EvalError::AssumptionNotHeld =>
                 "`assume` argument was false",
-            EvalError::Assembler =>
-                "cannot evaluate assembler code",
+            EvalError::InlineAsm =>
+                "cannot evaluate inline assembly",
         }
     }
 
diff --git a/src/interpreter/mod.rs b/src/interpreter/mod.rs
index 70b7806706fc..41dfa6806fb5 100644
--- a/src/interpreter/mod.rs
+++ b/src/interpreter/mod.rs
@@ -661,7 +661,7 @@ impl<'a, 'tcx> EvalContext<'a, 'tcx> {
                 }
             }
 
-            InlineAsm { .. } => return Err(EvalError::Assembler),
+            InlineAsm { .. } => return Err(EvalError::InlineAsm),
         }
 
         Ok(())