---

yaml
---
r: 10551
b: refs/heads/snap-stage3
c: 52f1904
h: refs/heads/master
i:
  10549: 6b1b597
  10547: 31a3d27
  10543: 8ffa087
v: v3

Author: eholk

[refs]

@@ -1,6 +1,6 @@
 ---
 refs/heads/master: 2898dcc5d97da9427ac367542382b6239d9c0bbf
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 21d56f2c68bf54e52611db486f900e93d1d2a349
+refs/heads/snap-stage3: 52f1904ddde95fb7d8e654b4cc78a4f162385275
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/snap-stage3/src/libcore/arc.rs

@@ -102,11 +102,14 @@ impl methods<T> for exclusive<T> {
     fn with<U>(f: fn(sys::condition, x: &T) -> U) -> U {
         unsafe {
             let ptr: ~arc_data<ex_data<T>> = unsafe::reinterpret_cast(*self);
-            let rec: &ex_data<T> = &(*ptr).data;
+            let r = {
+                let rec: &ex_data<T> = &(*ptr).data;
+                rec.lock.lock_cond() {|c|
+                    f(c, &rec.data)
+                }
+            };
             unsafe::forget(ptr);
-            rec.lock.lock_cond() {|c|
-                f(c, &rec.data)
-            }
+            r
         }
     }
 }

branches/snap-stage3/src/libsyntax/ast_util.rs

@@ -454,7 +454,7 @@ fn id_visitor(vfn: fn@(node_id)) -> visit::vt<()> {
 
         visit_expr: fn@(e: @expr) {
             vfn(e.id);
-            alt e.node { 
+            alt e.node {
               expr_index(*) | expr_assign_op(*) |
               expr_unary(*) | expr_binary(*) {
                 vfn(ast_util::op_expr_callee_id(e));