Skip to content

Commit f96ee10

Browse files
alexcrichtonalexcrichton
committed
Test fixes from the rollup
1 parent 7ae802f commit f96ee10

File tree

11 files changed

+60
-59
lines changed

11 files changed

+60
-59
lines changed

‎src/liballoc/heap.rs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -344,6 +344,7 @@ mod imp {
344344
mod test {
345345
extern crate test;
346346
use self::test::Bencher;
347+
use heap;
347348

348349
#[test]
349350
fn basic_reallocate_inplace_noop() {

‎src/libgreen/basic.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,13 +73,13 @@ impl BasicLoop {
7373
RunRemote(i) => {
7474
match self.remotes.iter_mut().find(|& &(id, _)| id == i) {
7575
Some(&(_, ref mut f)) => f.call(),
76-
None => unreachable!()
76+
None => fail!("bad remote: {}", i),
7777
}
7878
}
7979
RemoveRemote(i) => {
8080
match self.remotes.iter().position(|&(id, _)| id == i) {
8181
Some(i) => { self.remotes.remove(i).unwrap(); }
82-
None => unreachable!()
82+
None => fail!("bad remote: {}", i),
8383
}
8484
}
8585
}

‎src/test/bench/task-perf-alloc-unwind.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ fn recurse_or_fail(depth: int, st: Option<State>) {
8989
State {
9090
unique: box Cons((), box *st.unique),
9191
vec: st.vec.clone().append(
92-
&[box Cons((), *st.vec.last().unwrap())]),
93-
res: r(box Cons((), st.res._l))
92+
&[box Cons((), st.vec.last().unwrap().clone())]),
93+
res: r(box Cons((), st.res._l.clone()))
9494
}
9595
}
9696
};

‎src/test/debuginfo/borrowed-struct.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,13 +30,13 @@
3030
// gdb-check:$4 = {x = 11, y = 24.5}
3131

3232
// gdb-command:print *unique_val_ref
33-
// gdb-check:$8 = {x = 13, y = 26.5}
33+
// gdb-check:$5 = {x = 13, y = 26.5}
3434

3535
// gdb-command:print *unique_val_interior_ref_1
36-
// gdb-check:$9 = 13
36+
// gdb-check:$6 = 13
3737

3838
// gdb-command:print *unique_val_interior_ref_2
39-
// gdb-check:$10 = 26.5
39+
// gdb-check:$7 = 26.5
4040

4141

4242
// === LLDB TESTS ==================================================================================
@@ -56,13 +56,13 @@
5656
// lldb-check:[...]$3 = SomeStruct { x: 11, y: 24.5 }
5757

5858
// lldb-command:print *unique_val_ref
59-
// lldb-check:[...]$7 = SomeStruct { x: 13, y: 26.5 }
59+
// lldb-check:[...]$4 = SomeStruct { x: 13, y: 26.5 }
6060

6161
// lldb-command:print *unique_val_interior_ref_1
62-
// lldb-check:[...]$8 = 13
62+
// lldb-check:[...]$5 = 13
6363

6464
// lldb-command:print *unique_val_interior_ref_2
65-
// lldb-check:[...]$9 = 26.5
65+
// lldb-check:[...]$6 = 26.5
6666

6767
#![allow(unused_variable)]
6868

‎src/test/debuginfo/borrowed-tuple.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
// gdb-check:$2 = {-15, -20}
2727

2828
// gdb-command:print *unique_val_ref
29-
// gdb-check:$4 = {-17, -22}
29+
// gdb-check:$3 = {-17, -22}
3030

3131

3232
// === LLDB TESTS ==================================================================================
@@ -40,7 +40,7 @@
4040
// lldb-check:[...]$1 = (-15, -20)
4141

4242
// lldb-command:print *unique_val_ref
43-
// lldb-check:[...]$3 = (-17, -22)
43+
// lldb-check:[...]$2 = (-17, -22)
4444

4545

4646
#![allow(unused_variable)]

‎src/test/debuginfo/boxed-struct.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
// gdb-check:$1 = {x = 99, y = 999, z = 9999, w = 99999}
2323

2424
// gdb-command:print *unique_dtor
25-
// gdb-check:$3 = {x = 77, y = 777, z = 7777, w = 77777}
25+
// gdb-check:$2 = {x = 77, y = 777, z = 7777, w = 77777}
2626

2727

2828
// === LLDB TESTS ==================================================================================
@@ -33,7 +33,7 @@
3333
// lldb-check:[...]$0 = StructWithSomePadding { x: 99, y: 999, z: 9999, w: 99999 }
3434

3535
// lldb-command:print *unique_dtor
36-
// lldb-check:[...]$2 = StructWithDestructor { x: 77, y: 777, z: 7777, w: 77777 }
36+
// lldb-check:[...]$1 = StructWithDestructor { x: 77, y: 777, z: 7777, w: 77777 }
3737

3838
#![allow(unused_variable)]
3939

‎src/test/debuginfo/recursive-struct.rs‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -30,45 +30,45 @@
3030
// gdb-check:$4 = 3
3131

3232
// gdb-command:print vec_unique[0].value
33-
// gdb-check:$7 = 6.5
33+
// gdb-check:$5 = 6.5
3434
// gdb-command:print vec_unique[0].next.RUST$ENCODED$ENUM$0$Empty.val->value
35-
// gdb-check:$8 = 7.5
35+
// gdb-check:$6 = 7.5
3636

3737
// gdb-command:print borrowed_unique->value
38-
// gdb-check:$9 = 8.5
38+
// gdb-check:$7 = 8.5
3939
// gdb-command:print borrowed_unique->next.RUST$ENCODED$ENUM$0$Empty.val->value
40-
// gdb-check:$10 = 9.5
40+
// gdb-check:$8 = 9.5
4141

4242
// LONG CYCLE
4343
// gdb-command:print long_cycle1.value
44-
// gdb-check:$21 = 20
44+
// gdb-check:$9 = 20
4545
// gdb-command:print long_cycle1.next->value
46-
// gdb-check:$22 = 21
46+
// gdb-check:$10 = 21
4747
// gdb-command:print long_cycle1.next->next->value
48-
// gdb-check:$23 = 22
48+
// gdb-check:$11 = 22
4949
// gdb-command:print long_cycle1.next->next->next->value
50-
// gdb-check:$24 = 23
50+
// gdb-check:$12 = 23
5151

5252
// gdb-command:print long_cycle2.value
53-
// gdb-check:$25 = 24
53+
// gdb-check:$13 = 24
5454
// gdb-command:print long_cycle2.next->value
55-
// gdb-check:$26 = 25
55+
// gdb-check:$14 = 25
5656
// gdb-command:print long_cycle2.next->next->value
57-
// gdb-check:$27 = 26
57+
// gdb-check:$15 = 26
5858

5959
// gdb-command:print long_cycle3.value
60-
// gdb-check:$28 = 27
60+
// gdb-check:$16 = 27
6161
// gdb-command:print long_cycle3.next->value
62-
// gdb-check:$29 = 28
62+
// gdb-check:$17 = 28
6363

6464
// gdb-command:print long_cycle4.value
65-
// gdb-check:$30 = 29.5
65+
// gdb-check:$18 = 29.5
6666

6767
// gdb-command:print (*****long_cycle_w_anonymous_types).value
68-
// gdb-check:$31 = 30
68+
// gdb-check:$19 = 30
6969

7070
// gdb-command:print (*****((*****long_cycle_w_anonymous_types).next.RUST$ENCODED$ENUM$0$Empty.val)).value
71-
// gdb-check:$32 = 31
71+
// gdb-check:$20 = 31
7272

7373
// gdb-command:continue
7474

‎src/test/debuginfo/simd.rs‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -18,27 +18,27 @@
1818
// gdb-command:run
1919

2020
// gdb-command:finish
21-
// gdb-command:print/d i8x16
21+
// gdb-command:print/d vi8x16
2222
// gdb-check:$1 = {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15}
23-
// gdb-command:print/d i16x8
23+
// gdb-command:print/d vi16x8
2424
// gdb-check:$2 = {16, 17, 18, 19, 20, 21, 22, 23}
25-
// gdb-command:print/d i32x4
25+
// gdb-command:print/d vi32x4
2626
// gdb-check:$3 = {24, 25, 26, 27}
27-
// gdb-command:print/d i64x2
27+
// gdb-command:print/d vi64x2
2828
// gdb-check:$4 = {28, 29}
2929

30-
// gdb-command:print/d u8x16
30+
// gdb-command:print/d vu8x16
3131
// gdb-check:$5 = {30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45}
32-
// gdb-command:print/d u16x8
32+
// gdb-command:print/d vu16x8
3333
// gdb-check:$6 = {46, 47, 48, 49, 50, 51, 52, 53}
34-
// gdb-command:print/d u32x4
34+
// gdb-command:print/d vu32x4
3535
// gdb-check:$7 = {54, 55, 56, 57}
36-
// gdb-command:print/d u64x2
36+
// gdb-command:print/d vu64x2
3737
// gdb-check:$8 = {58, 59}
3838

39-
// gdb-command:print f32x4
39+
// gdb-command:print vf32x4
4040
// gdb-check:$9 = {60.5, 61.5, 62.5, 63.5}
41-
// gdb-command:print f64x2
41+
// gdb-command:print vf64x2
4242
// gdb-check:$10 = {64.5, 65.5}
4343

4444
// gdb-command:continue
@@ -50,21 +50,21 @@ use std::simd::{i8x16, i16x8,i32x4,i64x2,u8x16,u16x8,u32x4,u64x2,f32x4,f64x2};
5050

5151
fn main() {
5252

53-
let i8x16 = i8x16(0i8, 1i8, 2i8, 3i8, 4i8, 5i8, 6i8, 7i8,
53+
let vi8x16 = i8x16(0i8, 1i8, 2i8, 3i8, 4i8, 5i8, 6i8, 7i8,
5454
8i8, 9i8, 10i8, 11i8, 12i8, 13i8, 14i8, 15i8);
5555

56-
let i16x8 = i16x8(16i16, 17i16, 18i16, 19i16, 20i16, 21i16, 22i16, 23i16);
57-
let i32x4 = i32x4(24i32, 25i32, 26i32, 27i32);
58-
let i64x2 = i64x2(28i64, 29i64);
56+
let vi16x8 = i16x8(16i16, 17i16, 18i16, 19i16, 20i16, 21i16, 22i16, 23i16);
57+
let vi32x4 = i32x4(24i32, 25i32, 26i32, 27i32);
58+
let vi64x2 = i64x2(28i64, 29i64);
5959

60-
let u8x16 = u8x16(30u8, 31u8, 32u8, 33u8, 34u8, 35u8, 36u8, 37u8,
60+
let vu8x16 = u8x16(30u8, 31u8, 32u8, 33u8, 34u8, 35u8, 36u8, 37u8,
6161
38u8, 39u8, 40u8, 41u8, 42u8, 43u8, 44u8, 45u8);
62-
let u16x8 = u16x8(46u16, 47u16, 48u16, 49u16, 50u16, 51u16, 52u16, 53u16);
63-
let u32x4 = u32x4(54u32, 55u32, 56u32, 57u32);
64-
let u64x2 = u64x2(58u64, 59u64);
62+
let vu16x8 = u16x8(46u16, 47u16, 48u16, 49u16, 50u16, 51u16, 52u16, 53u16);
63+
let vu32x4 = u32x4(54u32, 55u32, 56u32, 57u32);
64+
let vu64x2 = u64x2(58u64, 59u64);
6565

66-
let f32x4 = f32x4(60.5f32, 61.5f32, 62.5f32, 63.5f32);
67-
let f64x2 = f64x2(64.5f64, 65.5f64);
66+
let vf32x4 = f32x4(60.5f32, 61.5f32, 62.5f32, 63.5f32);
67+
let vf64x2 = f64x2(64.5f64, 65.5f64);
6868

6969
zzz();
7070
}

‎src/test/debuginfo/var-captured-in-nested-closure.rs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,22 +29,22 @@
2929
// gdb-command:print *owned
3030
// gdb-check:$5 = 6
3131
// gdb-command:print closure_local
32-
// gdb-check:$7 = 8
32+
// gdb-check:$6 = 8
3333
// gdb-command:continue
3434

3535
// gdb-command:finish
3636
// gdb-command:print variable
37-
// gdb-check:$8 = 1
37+
// gdb-check:$7 = 1
3838
// gdb-command:print constant
39-
// gdb-check:$9 = 2
39+
// gdb-check:$8 = 2
4040
// gdb-command:print a_struct
41-
// gdb-check:$10 = {a = -3, b = 4.5, c = 5}
41+
// gdb-check:$9 = {a = -3, b = 4.5, c = 5}
4242
// gdb-command:print *struct_ref
43-
// gdb-check:$11 = {a = -3, b = 4.5, c = 5}
43+
// gdb-check:$10 = {a = -3, b = 4.5, c = 5}
4444
// gdb-command:print *owned
45-
// gdb-check:$12 = 6
45+
// gdb-check:$11 = 6
4646
// gdb-command:print closure_local
47-
// gdb-check:$14 = 8
47+
// gdb-check:$12 = 8
4848
// gdb-command:continue
4949

5050

‎src/test/pretty/block-disambig.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ fn test9() {
6060
fn test10() -> int {
6161
let regs = vec!(0i);
6262
match true { true => { } _ => { } }
63-
*(*regs).get(0)
63+
regs[0]
6464
}
6565

6666
fn test11() -> Vec<int> { if true { } vec!(1, 2) }

0 commit comments

Comments
 (0)