Skip to content

Commit eb86b36

Browse files
committed
---
yaml --- r: 13536 b: refs/heads/master c: 69447e9 h: refs/heads/master v: v3
1 parent 74ef21d commit eb86b36

File tree

3 files changed

+6
-9
lines changed

3 files changed

+6
-9
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 416b3bfea444e67d6c18e3578193376e6ca2b659
2+
refs/heads/master: 69447e90021d7a35968ba32a8755a1be7e9d2a4c
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
55
refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/libcore/arc.rs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -102,14 +102,11 @@ impl methods<T> for exclusive<T> {
102102
fn with<U>(f: fn(sys::condition, x: &T) -> U) -> U {
103103
unsafe {
104104
let ptr: ~arc_data<ex_data<T>> = unsafe::reinterpret_cast(*self);
105-
let r = {
106-
let rec: &ex_data<T> = &(*ptr).data;
107-
rec.lock.lock_cond() {|c|
108-
f(c, &rec.data)
109-
}
110-
};
105+
let rec: &ex_data<T> = &(*ptr).data;
111106
unsafe::forget(ptr);
112-
r
107+
rec.lock.lock_cond() {|c|
108+
f(c, &rec.data)
109+
}
113110
}
114111
}
115112
}

trunk/src/libsyntax/ast_util.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -454,7 +454,7 @@ fn id_visitor(vfn: fn@(node_id)) -> visit::vt<()> {
454454

455455
visit_expr: fn@(e: @expr) {
456456
vfn(e.id);
457-
alt e.node {
457+
alt e.node {
458458
expr_index(*) | expr_assign_op(*) |
459459
expr_unary(*) | expr_binary(*) {
460460
vfn(ast_util::op_expr_callee_id(e));

0 commit comments

Comments
 (0)