---

yaml
---
r: 81847
b: refs/heads/master
c: 9d07277
h: refs/heads/master
i:
  81845: 611a072
  81843: 425aac3
  81839: ed29963
v: v3

Author: pnkfelix

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 2ceebf10707d695497fa9b47b17ebdf7d1cc3c47
+refs/heads/master: 9d0727736b237daeff2bc416ba0abb5713a35195
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 6c08cc2db4f98e9f07ae7d50338396c4123c2f0a
 refs/heads/try: 70152ff55722878cde684ee6462c14c65f2c4729

trunk/src/librustc/middle/trans/callee.rs

@@ -570,29 +570,30 @@ pub fn trans_lang_call_with_type_params(bcx: @mut Block,
 }
 
 
-struct CalleeTranslationVisitor;
+struct CalleeTranslationVisitor {
+    flag: bool,
+}
 
-impl Visitor<@mut bool> for CalleeTranslationVisitor {
+impl Visitor<()> for CalleeTranslationVisitor {
 
-    fn visit_item(&mut self, _:@ast::item, _:@mut bool) { }
+    fn visit_item(&mut self, _:@ast::item, _:()) { }
 
-    fn visit_expr(&mut self, e:@ast::Expr, cx:@mut bool) {
+    fn visit_expr(&mut self, e:@ast::Expr, _:()) {
 
-            if !*cx {
+            if !self.flag {
                 match e.node {
-                  ast::ExprRet(_) => *cx = true,
-                  _ => visit::walk_expr(self, e, cx),
+                  ast::ExprRet(_) => self.flag = true,
+                  _ => visit::walk_expr(self, e, ()),
                 }
             }
     }
 
 }
 
 pub fn body_contains_ret(body: &ast::Block) -> bool {
-    let cx = @mut false;
-    let mut v = CalleeTranslationVisitor;
-    visit::walk_block(&mut v, body, cx);
-    *cx
+    let mut v = CalleeTranslationVisitor{ flag: false };
+    visit::walk_block(&mut v, body, ());
+    v.flag
 }
 
 pub fn trans_call_inner(in_cx: @mut Block,