about summary refs log tree commit diff
path: root/src/libcore/tests
diff options
context:
space:
mode:
authorkennytm <kennytm@gmail.com>2018-12-23 00:07:39 +0800
committerkennytm <kennytm@gmail.com>2018-12-23 02:11:56 +0800
commit314e61f37eb7873f73294bd6e6ce37a64c5232fc (patch)
treed61bf79364af57fa224a3a13b43ee79d431c046e /src/libcore/tests
parent660eca64afcf92a8bca2de10400647107602eaba (diff)
parent455bc95317ddb3f8d528d0220bfde7f7a7286463 (diff)
downloadrust-314e61f37eb7873f73294bd6e6ce37a64c5232fc.tar.gz
rust-314e61f37eb7873f73294bd6e6ce37a64c5232fc.zip
Rollup merge of #56936 - ubsan:euclidean_div_rem, r=dtolnay
rename div_euc -> div_euclid, and mod_euc -> rem_euclid

logic is written up in #49048

Also, update the documentation slightly.

cc @alexcrichton @clarcharr @varkor
Diffstat (limited to 'src/libcore/tests')
-rw-r--r--src/libcore/tests/num/int_macros.rs4
-rw-r--r--src/libcore/tests/num/mod.rs26
2 files changed, 15 insertions, 15 deletions
diff --git a/src/libcore/tests/num/int_macros.rs b/src/libcore/tests/num/int_macros.rs
index 71d2e794538..8b04f84007f 100644
--- a/src/libcore/tests/num/int_macros.rs
+++ b/src/libcore/tests/num/int_macros.rs
@@ -31,8 +31,8 @@ mod tests {
     }
 
     #[test]
-    fn test_mod_euc() {
-        assert!((-1 as $T).mod_euc(MIN) == MAX);
+    fn test_rem_euclid() {
+        assert!((-1 as $T).rem_euclid(MIN) == MAX);
     }
 
     #[test]
diff --git a/src/libcore/tests/num/mod.rs b/src/libcore/tests/num/mod.rs
index 0928f7560e1..e1648db5e8e 100644
--- a/src/libcore/tests/num/mod.rs
+++ b/src/libcore/tests/num/mod.rs
@@ -694,23 +694,23 @@ macro_rules! test_float {
             assert!(($nan as $fty).max($nan).is_nan());
         }
         #[test]
-        fn mod_euc() {
+        fn rem_euclid() {
             let a: $fty = 42.0;
-            assert!($inf.mod_euc(a).is_nan());
-            assert_eq!(a.mod_euc($inf), a);
-            assert!(a.mod_euc($nan).is_nan());
-            assert!($inf.mod_euc($inf).is_nan());
-            assert!($inf.mod_euc($nan).is_nan());
-            assert!($nan.mod_euc($inf).is_nan());
+            assert!($inf.rem_euclid(a).is_nan());
+            assert_eq!(a.rem_euclid($inf), a);
+            assert!(a.rem_euclid($nan).is_nan());
+            assert!($inf.rem_euclid($inf).is_nan());
+            assert!($inf.rem_euclid($nan).is_nan());
+            assert!($nan.rem_euclid($inf).is_nan());
         }
         #[test]
-        fn div_euc() {
+        fn div_euclid() {
             let a: $fty = 42.0;
-            assert_eq!(a.div_euc($inf), 0.0);
-            assert!(a.div_euc($nan).is_nan());
-            assert!($inf.div_euc($inf).is_nan());
-            assert!($inf.div_euc($nan).is_nan());
-            assert!($nan.div_euc($inf).is_nan());
+            assert_eq!(a.div_euclid($inf), 0.0);
+            assert!(a.div_euclid($nan).is_nan());
+            assert!($inf.div_euclid($inf).is_nan());
+            assert!($inf.div_euclid($nan).is_nan());
+            assert!($nan.div_euclid($inf).is_nan());
         }
     } }
 }