From e4dcdcab650f1c32864ac243fbdb410e5115a957 Mon Sep 17 00:00:00 2001
From: Scott Olson <scott@solson.me>
Date: Tue, 29 Mar 2016 19:08:45 -0600
Subject: [PATCH] Remove unnecessary Result return in push_stack_frame.

---
 src/interpreter.rs | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/interpreter.rs b/src/interpreter.rs
index f2e7702717d..342ca3628c2 100644
--- a/src/interpreter.rs
+++ b/src/interpreter.rs
@@ -162,9 +162,7 @@ fn print_trace<T: Debug>(t: &T, suffix: &'static str, indent: usize) {
         Ok(())
     }
 
-    fn push_stack_frame(&mut self, mir: CachedMir<'a, 'tcx>, return_ptr: Option<Pointer>)
-        -> EvalResult<()>
-    {
+    fn push_stack_frame(&mut self, mir: CachedMir<'a, 'tcx>, return_ptr: Option<Pointer>) {
         let arg_tys = mir.arg_decls.iter().map(|a| a.ty);
         let var_tys = mir.var_decls.iter().map(|v| v.ty);
         let temp_tys = mir.temp_decls.iter().map(|t| t.ty);
@@ -185,8 +183,6 @@ fn push_stack_frame(&mut self, mir: CachedMir<'a, 'tcx>, return_ptr: Option<Poin
             var_offset: num_args,
             temp_offset: num_args + num_vars,
         });
-
-        Ok(())
     }
 
     fn pop_stack_frame(&mut self) {
@@ -310,7 +306,7 @@ fn eval_terminator(&mut self, terminator: &mir::Terminator<'tcx>)
 
                                 let mir = self.load_mir(def_id);
                                 self.substs_stack.push(substs);
-                                try!(self.push_stack_frame(mir, return_ptr));
+                                self.push_stack_frame(mir, return_ptr);
 
                                 for (i, (src, size)) in arg_srcs.into_iter().enumerate() {
                                     let dest = self.frame().locals[i];
@@ -1149,7 +1145,7 @@ fn print_allocation_tree(memory: &Memory, alloc_id: memory::AllocId) {
                     }
                     ty::FnDiverging => None,
                 };
-                miri.push_stack_frame(CachedMir::Ref(mir), return_ptr).unwrap();
+                miri.push_stack_frame(CachedMir::Ref(mir), return_ptr);
                 miri.run().unwrap();
 
                 if let Some(ret) = return_ptr {
-- 
2.44.0