Skip to content

Commit bd736a0

Browse files
committed
oops, remove #[cfg(stage1)]s from arc::unwrap functions+tests
1 parent 1aa50bb commit bd736a0

File tree

2 files changed

+0
-9
lines changed

2 files changed

+0
-9
lines changed

src/libcore/unsafe.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,6 @@ impl<T: send> Exclusive<T> {
330330
}
331331
332332
// FIXME(#2585) make this a by-move method on the exclusive
333-
#[cfg(stage1)]
334333
fn unwrap_exclusive<T: send>(+arc: Exclusive<T>) -> T {
335334
let Exclusive { x: x } = arc;
336335
let inner = unsafe { unwrap_shared_mutable_state(x) };
@@ -426,14 +425,12 @@ mod tests {
426425
}
427426

428427
#[test]
429-
#[cfg(stage1)]
430428
fn exclusive_unwrap_basic() {
431429
let x = exclusive(~~"hello");
432430
assert unwrap_exclusive(x) == ~~"hello";
433431
}
434432

435433
#[test]
436-
#[cfg(stage1)]
437434
fn exclusive_unwrap_contended() {
438435
let x = exclusive(~~"hello");
439436
let x2 = ~mut some(x.clone());
@@ -459,7 +456,6 @@ mod tests {
459456
}
460457

461458
#[test] #[should_fail] #[ignore(cfg(windows))]
462-
#[cfg(stage1)]
463459
fn exclusive_unwrap_conflict() {
464460
let x = exclusive(~~"hello");
465461
let x2 = ~mut some(x.clone());
@@ -474,7 +470,6 @@ mod tests {
474470
}
475471

476472
#[test] #[ignore(cfg(windows))]
477-
#[cfg(stage1)]
478473
fn exclusive_unwrap_deadlock() {
479474
// This is not guaranteed to get to the deadlock before being killed,
480475
// but it will show up sometimes, and if the deadlock were not there,

src/libstd/arc.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,6 @@ fn clone<T: const send>(rc: &arc<T>) -> arc<T> {
9393
arc { x: unsafe { clone_shared_mutable_state(&rc.x) } }
9494
}
9595

96-
#[cfg(stage1)]
9796
fn unwrap<T: const send>(+rc: arc<T>) -> T {
9897
let arc { x: x } = rc;
9998
unsafe { unwrap_shared_mutable_state(x) }
@@ -188,7 +187,6 @@ impl<T: send> &mutex_arc<T> {
188187
}
189188

190189
// FIXME(#2585) make this a by-move method on the arc
191-
#[cfg(stage1)]
192190
fn unwrap_mutex_arc<T: send>(+arc: mutex_arc<T>) -> T {
193191
let mutex_arc { x: x } = arc;
194192
let inner = unsafe { unwrap_shared_mutable_state(x) };
@@ -366,7 +364,6 @@ impl<T: const send> &rw_arc<T> {
366364
}
367365
368366
// FIXME(#2585) make this a by-move method on the arc
369-
#[cfg(stage1)]
370367
fn unwrap_rw_arc<T: const send>(+arc: rw_arc<T>) -> T {
371368
let rw_arc { x: x, _ } = arc;
372369
let inner = unsafe { unwrap_shared_mutable_state(x) };
@@ -527,7 +524,6 @@ mod tests {
527524
}
528525
}
529526
#[test] #[should_fail] #[ignore(cfg(windows))]
530-
#[cfg(stage1)]
531527
fn test_mutex_arc_unwrap_poison() {
532528
let arc = mutex_arc(1);
533529
let arc2 = ~(&arc).clone();

0 commit comments

Comments
 (0)