Skip to content

Commit

Permalink
undo changes to run-pass tests that aren't errors anymore
Browse files Browse the repository at this point in the history
  • Loading branch information
oli-obk committed Mar 11, 2016
1 parent fcee002 commit 08c448a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions src/test/run-pass/packed-struct-generic-layout.rs
Expand Up @@ -20,7 +20,7 @@ struct S<T, S> {

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


let s = S { a: 1u8, b: 2u8, c: 0b10000001_10000001 as u16};
let s = S { a: 1u8, b: 2u8, c: 0b10000001_10000001 as i16};
let transd : [u8; 4] = mem::transmute(s);
// Again, no endianness problems.
assert_eq!(transd,
Expand Down
6 changes: 3 additions & 3 deletions src/test/run-pass/shift.rs
Expand Up @@ -45,7 +45,7 @@ fn test_expr() {
let v4 = 4 as isize;
let v2 = 2 as isize;
assert_eq!(v10 >> v2 as usize, v2 as i8);
assert_eq!(v10 << v2 as usize, 40 as i8);
assert_eq!(v10 << v4 as usize, 160 as i8);

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

static r1_4: i8 = 10i8 >> 2_usize;
static r2_4: i8 = 10i8 << 2_usize;
static r2_4: i8 = 10i8 << 4_usize;
assert_eq!(r1_4, 2 as i8);
assert_eq!(r2_4, 40 as i8);
assert_eq!(r2_4, 160 as i8);

static r1_5: usize = 10_usize >> 2_usize;
static r2_5: usize = 10_usize << 4_usize;
Expand Down

0 comments on commit 08c448a

Please sign in to comment.