Skip to content

Commit 08c448a

Browse files
committed
undo changes to run-pass tests that aren't errors anymore
1 parent fcee002 commit 08c448a

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/test/run-pass/packed-struct-generic-layout.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ struct S<T, S> {
2020

2121
pub fn main() {
2222
unsafe {
23-
let s = S { a: 0xff_ff_ff_ffu32, b: 1, c: 0xaa_aa_aa_aa as u32 };
23+
let s = S { a: 0xff_ff_ff_ffu32, b: 1, c: 0xaa_aa_aa_aa as i32 };
2424
let transd : [u8; 9] = mem::transmute(s);
2525
// Don't worry about endianness, the numbers are palindromic.
2626
assert_eq!(transd,
@@ -29,7 +29,7 @@ pub fn main() {
2929
0xaa, 0xaa, 0xaa, 0xaa]);
3030

3131

32-
let s = S { a: 1u8, b: 2u8, c: 0b10000001_10000001 as u16};
32+
let s = S { a: 1u8, b: 2u8, c: 0b10000001_10000001 as i16};
3333
let transd : [u8; 4] = mem::transmute(s);
3434
// Again, no endianness problems.
3535
assert_eq!(transd,

src/test/run-pass/shift.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ fn test_expr() {
4545
let v4 = 4 as isize;
4646
let v2 = 2 as isize;
4747
assert_eq!(v10 >> v2 as usize, v2 as i8);
48-
assert_eq!(v10 << v2 as usize, 40 as i8);
48+
assert_eq!(v10 << v4 as usize, 160 as i8);
4949

5050
let v10 = 10 as usize;
5151
let v4 = 4 as isize;
@@ -71,9 +71,9 @@ fn test_const() {
7171
assert_eq!(r2_3, 160 as isize);
7272

7373
static r1_4: i8 = 10i8 >> 2_usize;
74-
static r2_4: i8 = 10i8 << 2_usize;
74+
static r2_4: i8 = 10i8 << 4_usize;
7575
assert_eq!(r1_4, 2 as i8);
76-
assert_eq!(r2_4, 40 as i8);
76+
assert_eq!(r2_4, 160 as i8);
7777

7878
static r1_5: usize = 10_usize >> 2_usize;
7979
static r2_5: usize = 10_usize << 4_usize;

0 commit comments

Comments
 (0)