about summary refs log tree commit diff
path: root/src
diff options
context:
space:
mode:
authorFelix S. Klock II <pnkfelix@pnkfx.org>2015-04-02 01:09:05 +0200
committerFelix S. Klock II <pnkfelix@pnkfx.org>2015-04-02 01:09:05 +0200
commitc8bf5f5d9742ea94a8a024ff1d9776090718c61d (patch)
tree867f03304014c7643fe170e9563fd5ebdb0589f9 /src
parentb85c4d16d52c7f0a3fec5d4ce4d686f0a70fa512 (diff)
downloadrust-c8bf5f5d9742ea94a8a024ff1d9776090718c61d.tar.gz
rust-c8bf5f5d9742ea94a8a024ff1d9776090718c61d.zip
partial set of fixes for fallout in tests/run-pass
Diffstat (limited to 'src')
-rw-r--r--src/test/run-pass/big-literals.rs8
-rw-r--r--src/test/run-pass/bitwise.rs1
-rw-r--r--src/test/run-pass/intrinsics-integer.rs1
-rw-r--r--src/test/run-pass/issue-17074.rs8
4 files changed, 10 insertions, 8 deletions
diff --git a/src/test/run-pass/big-literals.rs b/src/test/run-pass/big-literals.rs
index b73eac0c714..ab9d892ce2b 100644
--- a/src/test/run-pass/big-literals.rs
+++ b/src/test/run-pass/big-literals.rs
@@ -16,10 +16,10 @@
 #![deny(overflowing_literals)]
 
 pub fn main() {
-    assert_eq!(0xffffffff, (-1 as u32));
-    assert_eq!(4294967295, (-1 as u32));
-    assert_eq!(0xffffffffffffffff, (-1 as u64));
-    assert_eq!(18446744073709551615, (-1 as u64));
+    assert_eq!(0xffffffff, (!0 as u32));
+    assert_eq!(4294967295, (!0 as u32));
+    assert_eq!(0xffffffffffffffff, (!0 as u64));
+    assert_eq!(18446744073709551615, (!0 as u64));
 
     assert_eq!((-2147483648i32).wrapping_sub(1), 2147483647);
 }
diff --git a/src/test/run-pass/bitwise.rs b/src/test/run-pass/bitwise.rs
index d6117a04e35..a9f19c12b02 100644
--- a/src/test/run-pass/bitwise.rs
+++ b/src/test/run-pass/bitwise.rs
@@ -8,6 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#![feature(negate_unsigned)]
 
 #[cfg(any(target_arch = "x86", target_arch = "arm"))]
 fn target() {
diff --git a/src/test/run-pass/intrinsics-integer.rs b/src/test/run-pass/intrinsics-integer.rs
index a4661410ad6..15dbe796ef5 100644
--- a/src/test/run-pass/intrinsics-integer.rs
+++ b/src/test/run-pass/intrinsics-integer.rs
@@ -10,6 +10,7 @@
 
 // pretty-expanded FIXME #23616
 
+#![feature(negate_unsigned)]
 #![feature(intrinsics)]
 
 mod rusti {
diff --git a/src/test/run-pass/issue-17074.rs b/src/test/run-pass/issue-17074.rs
index 31f6a4209de..08c313ab0a4 100644
--- a/src/test/run-pass/issue-17074.rs
+++ b/src/test/run-pass/issue-17074.rs
@@ -10,10 +10,10 @@
 
 // pretty-expanded FIXME #23616
 
-static X2: u64 = -1 as u16 as u64;
-static Y2: u64 = -1 as u32 as u64;
-const X: u64 = -1 as u16 as u64;
-const Y: u64 = -1 as u32 as u64;
+static X2: u64 = !0 as u16 as u64;
+static Y2: u64 = !0 as u32 as u64;
+const X: u64 = !0 as u16 as u64;
+const Y: u64 = !0 as u32 as u64;
 
 fn main() {
     assert_eq!(match 1 {