File tree Expand file tree Collapse file tree 3 files changed +6
-9
lines changed Expand file tree Collapse file tree 3 files changed +6
-9
lines changed Original file line number Diff line number Diff line change 1
1
---
2
- refs/heads/master: 416b3bfea444e67d6c18e3578193376e6ca2b659
2
+ refs/heads/master: 69447e90021d7a35968ba32a8755a1be7e9d2a4c
3
3
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4
4
refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
5
5
refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf
Original file line number Diff line number Diff line change @@ -102,14 +102,11 @@ impl methods<T> for exclusive<T> {
102
102
fn with < U > ( f : fn ( sys:: condition , x : & T ) -> U ) -> U {
103
103
unsafe {
104
104
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 ;
111
106
unsafe :: forget ( ptr) ;
112
- r
107
+ rec. lock . lock_cond ( ) { |c|
108
+ f ( c, & rec. data )
109
+ }
113
110
}
114
111
}
115
112
}
Original file line number Diff line number Diff line change @@ -454,7 +454,7 @@ fn id_visitor(vfn: fn@(node_id)) -> visit::vt<()> {
454
454
455
455
visit_expr: fn @( e: @expr) {
456
456
vfn( e. id) ;
457
- alt e. node {
457
+ alt e. node {
458
458
expr_index( * ) | expr_assign_op( * ) |
459
459
expr_unary( * ) | expr_binary( * ) {
460
460
vfn( ast_util:: op_expr_callee_id( e) ) ;
You can’t perform that action at this time.
0 commit comments