about summary refs log tree commit diff
diff options
context:
space:
mode:
authorCAD97 <cad97@cad97.com>2020-03-14 15:13:18 -0400
committerCAD97 <cad97@cad97.com>2020-04-08 18:56:39 -0400
commitf34322d71f6ba523fb2c0ebef258d7e51a7531c8 (patch)
tree5b405c247b31580e01d74ef8d0315c887f51846a
parent2fcfd233f755c548ddc4d5fda517a7dbb9f04ba3 (diff)
downloadrust-f34322d71f6ba523fb2c0ebef258d7e51a7531c8.tar.gz
rust-f34322d71f6ba523fb2c0ebef258d7e51a7531c8.zip
Adjust Step::forward_checked docs for large types
Co-Authored-By: Nadrieril Feneanar <nadrieril@users.noreply.github.com>
-rw-r--r--src/libcore/iter/range.rs7
-rw-r--r--src/libcore/tests/iter.rs12
2 files changed, 7 insertions, 12 deletions
diff --git a/src/libcore/iter/range.rs b/src/libcore/iter/range.rs
index ae88fb471a0..1b096893902 100644
--- a/src/libcore/iter/range.rs
+++ b/src/libcore/iter/range.rs
@@ -45,8 +45,11 @@ pub unsafe trait Step: Clone + PartialOrd + Sized {
     ///
     /// For any `a`, `n`, and `m`:
     ///
-    /// * `Step::forward_checked(a, n).and_then(|x| Step::forward_checked(x, m)) == n.checked_add(m).and_then(|x| Step::forward_checked(a, x))`
-    /// * `Step::forward_checked(a, n).and_then(|x| Step::forward_checked(x, m)) == try { Step::forward_checked(a, n.checked_add(m)?) }`
+    /// * `Step::forward_checked(a, n).and_then(|x| Step::forward_checked(x, m)) == Step::forward_checked(a, m).and_then(|x| Step::forward_checked(x, n))`
+    ///
+    /// For any `a`, `n`, and `m` where `n + m` does not overflow:
+    ///
+    /// * `Step::forward_checked(a, n).and_then(|x| Step::forward_checked(x, m)) == Step::forward_checked(a, n + m)`
     ///
     /// For any `a` and `n`:
     ///
diff --git a/src/libcore/tests/iter.rs b/src/libcore/tests/iter.rs
index 13c05dadbde..e142641b8b5 100644
--- a/src/libcore/tests/iter.rs
+++ b/src/libcore/tests/iter.rs
@@ -228,11 +228,7 @@ fn test_iterator_chain_size_hint() {
         }
 
         fn size_hint(&self) -> (usize, Option<usize>) {
-            if self.is_empty {
-                (0, Some(0))
-            } else {
-                (1, Some(1))
-            }
+            if self.is_empty { (0, Some(0)) } else { (1, Some(1)) }
         }
     }
 
@@ -1558,11 +1554,7 @@ fn test_find_map() {
     assert_eq!(iter.next(), Some(&7));
 
     fn half_if_even(x: &isize) -> Option<isize> {
-        if x % 2 == 0 {
-            Some(x / 2)
-        } else {
-            None
-        }
+        if x % 2 == 0 { Some(x / 2) } else { None }
     }
 }