about summary refs log tree commit diff
diff options
context:
space:
mode:
authorOliver Schneider <git-spam-no-reply9815368754983@oli-obk.de>2016-03-11 09:44:11 +0100
committerOliver Schneider <git-spam-no-reply9815368754983@oli-obk.de>2016-03-11 09:44:11 +0100
commit08c448a7d3cf4ed06cf731a3458a64b97b2a6d9b (patch)
tree49642b08abc91493de435834d8d01b82e8bb164f
parentfcee002edfd1867ab49d9625de6c7907f484a7a9 (diff)
downloadrust-08c448a7d3cf4ed06cf731a3458a64b97b2a6d9b.tar.gz
rust-08c448a7d3cf4ed06cf731a3458a64b97b2a6d9b.zip
undo changes to run-pass tests that aren't errors anymore
-rw-r--r--src/test/run-pass/packed-struct-generic-layout.rs4
-rw-r--r--src/test/run-pass/shift.rs6
2 files changed, 5 insertions, 5 deletions
diff --git a/src/test/run-pass/packed-struct-generic-layout.rs b/src/test/run-pass/packed-struct-generic-layout.rs
index 1c8a1322ad2..b962a5c7933 100644
--- a/src/test/run-pass/packed-struct-generic-layout.rs
+++ b/src/test/run-pass/packed-struct-generic-layout.rs
@@ -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,
@@ -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,
diff --git a/src/test/run-pass/shift.rs b/src/test/run-pass/shift.rs
index 5ca6a023099..2f417e0e2f4 100644
--- a/src/test/run-pass/shift.rs
+++ b/src/test/run-pass/shift.rs
@@ -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;
@@ -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;