cleanup: s/impl Copy/#[derive(Copy)]/g

[rust.git] / src / test / run-pass / float-nan.rs

diff --git a/src/test/run-pass/float-nan.rs b/src/test/run-pass/float-nan.rs
index 08523de3ccd814df1f57277786db946ec77afd1d..4d9f7d507f0a50f316d729e9a5d2f0c6dcbb7b19 100644 (file)
--- a/src/test/run-pass/float-nan.rs
+++ b/src/test/run-pass/float-nan.rs
@@ -8,18 +8,15 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-extern mod std;
-
-use core::num::Float::{
-  NaN, infinity, neg_infinity
-};
+use std::num::Float;
 
 pub fn main() {
-  let nan = NaN::<float>();
-  assert!((nan).is_NaN());
+  let nan: f64 = Float::nan();
+  assert!((nan).is_nan());
 
-  let inf = infinity::<float>();
-  assert!(-inf == neg_infinity::<float>());
+  let inf: f64 = Float::infinity();
+  let neg_inf: f64 = Float::neg_infinity();
+  assert_eq!(-inf, neg_inf);
 
   assert!( nan !=  nan);
   assert!( nan != -nan);
@@ -36,17 +33,17 @@ pub fn main() {
   assert!( inf !=  nan);
   assert!(-inf !=  nan);
 
-  assert!(!( nan ==  nan));
+  assert!(!( nan == nan));
   assert!(!( nan == -nan));
-  assert!(!( nan ==   1.));
-  assert!(!( nan ==   0.));
-  assert!(!( nan ==  inf));
+  assert!(!( nan == 1.));
+  assert!(!( nan == 0.));
+  assert!(!( nan == inf));
   assert!(!( nan == -inf));
-  assert!(!(  1. ==  nan));
-  assert!(!(  0. ==  nan));
-  assert!(!( inf ==  nan));
-  assert!(!(-inf ==  nan));
-  assert!(!(-nan ==  nan));
+  assert!(!(  1. == nan));
+  assert!(!(  0. == nan));
+  assert!(!( inf == nan));
+  assert!(!(-inf == nan));
+  assert!(!(-nan == nan));
   assert!(!(-nan == -nan));
 
   assert!(!( nan >  nan));
@@ -74,22 +71,22 @@ pub fn main() {
   assert!(!(-inf < nan));
   assert!(!(-nan < nan));
 
-  assert!((nan + inf).is_NaN());
-  assert!((nan + -inf).is_NaN());
-  assert!((nan + 0.).is_NaN());
-  assert!((nan + 1.).is_NaN());
-  assert!((nan * 1.).is_NaN());
-  assert!((nan / 1.).is_NaN());
-  assert!((nan / 0.).is_NaN());
-  assert!((0f/0f).is_NaN());
-  assert!((-inf + inf).is_NaN());
-  assert!((inf - inf).is_NaN());
+  assert!((nan + inf).is_nan());
+  assert!((nan + -inf).is_nan());
+  assert!((nan + 0.).is_nan());
+  assert!((nan + 1.).is_nan());
+  assert!((nan * 1.).is_nan());
+  assert!((nan / 1.).is_nan());
+  assert!((nan / 0.).is_nan());
+  assert!((0.0/0.0f64).is_nan());
+  assert!((-inf + inf).is_nan());
+  assert!((inf - inf).is_nan());
 
-  assert!(!(-1f).is_NaN());
-  assert!(!(0f).is_NaN());
-  assert!(!(0.1f).is_NaN());
-  assert!(!(1f).is_NaN());
-  assert!(!(inf).is_NaN());
-  assert!(!(-inf).is_NaN());
-  assert!(!(1./-inf).is_NaN());
+  assert!(!(-1.0f64).is_nan());
+  assert!(!(0.0f64).is_nan());
+  assert!(!(0.1f64).is_nan());
+  assert!(!(1.0f64).is_nan());
+  assert!(!(inf).is_nan());
+  assert!(!(-inf).is_nan());
+  assert!(!(1./-inf).is_nan());
 }