Update tests to remove old numeric constants

[rust.git] / src / test / ui / half-open-range-patterns / half-open-range-pats-semantics.rs

diff --git a/src/test/ui/half-open-range-patterns/half-open-range-pats-semantics.rs b/src/test/ui/half-open-range-patterns/half-open-range-pats-semantics.rs
index 416c59af3fd3e58ba13dacc37df80bd88f3e1350..ae532d935df82e00e19bc0fe9717e0201fcca640 100644 (file)
--- a/src/test/ui/half-open-range-patterns/half-open-range-pats-semantics.rs
+++ b/src/test/ui/half-open-range-patterns/half-open-range-pats-semantics.rs
@@ -24,15 +24,15 @@ fn range_to_inclusive() {
     //---------------------------------------
 
     // u8; `..=X`
-    assert!(yes!(core::u8::MIN, ..=core::u8::MIN));
-    assert!(yes!(core::u8::MIN, ..=5));
+    assert!(yes!(u8::MIN, ..=u8::MIN));
+    assert!(yes!(u8::MIN, ..=5));
     assert!(yes!(5u8, ..=5));
     assert!(!yes!(6u8, ..=5));
 
     // i16; `..=X`
-    assert!(yes!(core::i16::MIN, ..=core::i16::MIN));
-    assert!(yes!(core::i16::MIN, ..=0));
-    assert!(yes!(core::i16::MIN, ..=-5));
+    assert!(yes!(i16::MIN, ..=i16::MIN));
+    assert!(yes!(i16::MIN, ..=0));
+    assert!(yes!(i16::MIN, ..=-5));
     assert!(yes!(-5, ..=-5));
     assert!(!yes!(-4, ..=-5));
 
@@ -43,14 +43,14 @@ fn range_to_inclusive() {
     assert!(!yes!('b', ..='a'));
 
     // f32; `..=X`
-    assert!(yes!(core::f32::NEG_INFINITY, ..=core::f32::NEG_INFINITY));
-    assert!(yes!(core::f32::NEG_INFINITY, ..=1.0f32));
+    assert!(yes!(f32::NEG_INFINITY, ..=f32::NEG_INFINITY));
+    assert!(yes!(f32::NEG_INFINITY, ..=1.0f32));
     assert!(yes!(1.5f32, ..=1.5f32));
     assert!(!yes!(1.6f32, ..=-1.5f32));
 
     // f64; `..=X`
-    assert!(yes!(core::f64::NEG_INFINITY, ..=core::f64::NEG_INFINITY));
-    assert!(yes!(core::f64::NEG_INFINITY, ..=1.0f64));
+    assert!(yes!(f64::NEG_INFINITY, ..=f64::NEG_INFINITY));
+    assert!(yes!(f64::NEG_INFINITY, ..=1.0f64));
     assert!(yes!(1.5f64, ..=1.5f64));
     assert!(!yes!(1.6f64, ..=-1.5f64));
 }
@@ -66,16 +66,16 @@ fn range_to() {
     assert!(!yes!(6u8, ..5));
 
     // u8; `..X`
-    const NU8: u8 = core::u8::MIN + 1;
-    assert!(yes!(core::u8::MIN, ..NU8));
+    const NU8: u8 = u8::MIN + 1;
+    assert!(yes!(u8::MIN, ..NU8));
     assert!(yes!(0u8, ..5));
     assert!(!yes!(5u8, ..5));
     assert!(!yes!(6u8, ..5));
 
     // i16; `..X`
-    const NI16: i16 = core::i16::MIN + 1;
-    assert!(yes!(core::i16::MIN, ..NI16));
-    assert!(yes!(core::i16::MIN, ..5));
+    const NI16: i16 = i16::MIN + 1;
+    assert!(yes!(i16::MIN, ..NI16));
+    assert!(yes!(i16::MIN, ..5));
     assert!(yes!(-6, ..-5));
     assert!(!yes!(-5, ..-5));
 
@@ -87,16 +87,16 @@ fn range_to() {
     assert!(!yes!('b', ..'a'));
 
     // f32; `..X`
-    assert!(yes!(core::f32::NEG_INFINITY, ..1.0f32));
+    assert!(yes!(f32::NEG_INFINITY, ..1.0f32));
     assert!(!yes!(1.5f32, ..1.5f32));
-    const E32: f32 = 1.5f32 + core::f32::EPSILON;
+    const E32: f32 = 1.5f32 + f32::EPSILON;
     assert!(yes!(1.5f32, ..E32));
     assert!(!yes!(1.6f32, ..1.5f32));
 
     // f64; `..X`
-    assert!(yes!(core::f64::NEG_INFINITY, ..1.0f64));
+    assert!(yes!(f64::NEG_INFINITY, ..1.0f64));
     assert!(!yes!(1.5f64, ..1.5f64));
-    const E64: f64 = 1.5f64 + core::f64::EPSILON;
+    const E64: f64 = 1.5f64 + f64::EPSILON;
     assert!(yes!(1.5f64, ..E64));
     assert!(!yes!(1.6f64, ..1.5f64));
 }
@@ -106,23 +106,23 @@ fn range_from() {
     //--------------------------------
 
     // u8; `X..`
-    assert!(yes!(core::u8::MIN, core::u8::MIN..));
-    assert!(yes!(core::u8::MAX, core::u8::MIN..));
-    assert!(!yes!(core::u8::MIN, 1..));
+    assert!(yes!(u8::MIN, u8::MIN..));
+    assert!(yes!(u8::MAX, u8::MIN..));
+    assert!(!yes!(u8::MIN, 1..));
     assert!(!yes!(4, 5..));
     assert!(yes!(5, 5..));
     assert!(yes!(6, 5..));
-    assert!(yes!(core::u8::MAX, core::u8::MAX..));
+    assert!(yes!(u8::MAX, u8::MAX..));
 
     // i16; `X..`
-    assert!(yes!(core::i16::MIN, core::i16::MIN..));
-    assert!(yes!(core::i16::MAX, core::i16::MIN..));
-    const NI16: i16 = core::i16::MIN + 1;
-    assert!(!yes!(core::i16::MIN, NI16..));
+    assert!(yes!(i16::MIN, i16::MIN..));
+    assert!(yes!(i16::MAX, i16::MIN..));
+    const NI16: i16 = i16::MIN + 1;
+    assert!(!yes!(i16::MIN, NI16..));
     assert!(!yes!(-4, 5..));
     assert!(yes!(-4, -4..));
     assert!(yes!(-3, -4..));
-    assert!(yes!(core::i16::MAX, core::i16::MAX..));
+    assert!(yes!(i16::MAX, i16::MAX..));
 
     // char; `X..`
     assert!(yes!('\u{0}', '\u{0}'..));
@@ -133,24 +133,24 @@ fn range_from() {
     assert!(yes!(core::char::MAX, core::char::MAX..));
 
     // f32; `X..`
-    assert!(yes!(core::f32::NEG_INFINITY, core::f32::NEG_INFINITY..));
-    assert!(yes!(core::f32::INFINITY, core::f32::NEG_INFINITY..));
-    assert!(!yes!(core::f32::NEG_INFINITY, 1.0f32..));
-    assert!(yes!(core::f32::INFINITY, 1.0f32..));
-    assert!(!yes!(1.0f32 - core::f32::EPSILON, 1.0f32..));
+    assert!(yes!(f32::NEG_INFINITY, f32::NEG_INFINITY..));
+    assert!(yes!(f32::INFINITY, f32::NEG_INFINITY..));
+    assert!(!yes!(f32::NEG_INFINITY, 1.0f32..));
+    assert!(yes!(f32::INFINITY, 1.0f32..));
+    assert!(!yes!(1.0f32 - f32::EPSILON, 1.0f32..));
     assert!(yes!(1.0f32, 1.0f32..));
-    assert!(yes!(core::f32::INFINITY, 1.0f32..));
-    assert!(yes!(core::f32::INFINITY, core::f32::INFINITY..));
+    assert!(yes!(f32::INFINITY, 1.0f32..));
+    assert!(yes!(f32::INFINITY, f32::INFINITY..));
 
     // f64; `X..`
-    assert!(yes!(core::f64::NEG_INFINITY, core::f64::NEG_INFINITY..));
-    assert!(yes!(core::f64::INFINITY, core::f64::NEG_INFINITY..));
-    assert!(!yes!(core::f64::NEG_INFINITY, 1.0f64..));
-    assert!(yes!(core::f64::INFINITY, 1.0f64..));
-    assert!(!yes!(1.0f64 - core::f64::EPSILON, 1.0f64..));
+    assert!(yes!(f64::NEG_INFINITY, f64::NEG_INFINITY..));
+    assert!(yes!(f64::INFINITY, f64::NEG_INFINITY..));
+    assert!(!yes!(f64::NEG_INFINITY, 1.0f64..));
+    assert!(yes!(f64::INFINITY, 1.0f64..));
+    assert!(!yes!(1.0f64 - f64::EPSILON, 1.0f64..));
     assert!(yes!(1.0f64, 1.0f64..));
-    assert!(yes!(core::f64::INFINITY, 1.0f64..));
-    assert!(yes!(core::f64::INFINITY, core::f64::INFINITY..));
+    assert!(yes!(f64::INFINITY, 1.0f64..));
+    assert!(yes!(f64::INFINITY, f64::INFINITY..));
 }
 
 fn main() {