From 6477a5c6949a66631958a2be2d98ef74777ffbc9 Mon Sep 17 00:00:00 2001
From: Scott Olson <scott@solson.me>
Date: Thu, 17 Mar 2016 06:39:29 -0600
Subject: [PATCH] Fix boolean tests and clean up code.

---
 src/memory.rs | 4 +---
 test/bools.rs | 6 ++++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/memory.rs b/src/memory.rs
index 86b00452bc00..ae927865b4dd 100644
--- a/src/memory.rs
+++ b/src/memory.rs
@@ -210,9 +210,7 @@ impl Memory {
     }
 
     pub fn write_bool(&mut self, ptr: Pointer, b: bool) -> EvalResult<()> {
-        let bytes = try!(self.get_bytes_mut(ptr, 1));
-        bytes[0] = b as u8;
-        Ok(())
+        self.get_bytes_mut(ptr, 1).map(|bytes| bytes[0] = b as u8)
     }
 
     pub fn read_int(&self, ptr: Pointer, size: usize) -> EvalResult<i64> {
diff --git a/test/bools.rs b/test/bools.rs
index e835d3e87e4b..f8e6c2d89d22 100755
--- a/test/bools.rs
+++ b/test/bools.rs
@@ -8,12 +8,14 @@ fn boolean() -> bool {
 
 #[miri_run]
 fn if_false() -> i64 {
-    if false { 1 } else { 0 }
+    let c = false;
+    if c { 1 } else { 0 }
 }
 
 #[miri_run]
 fn if_true() -> i64 {
-    if true { 1 } else { 0 }
+    let c = true;
+    if c { 1 } else { 0 }
 }
 
 #[miri_run]