about summary refs log tree commit diff
diff options
context:
space:
mode:
authorCAD97 <cad97@cad97.com>2020-05-20 23:50:28 -0400
committerCAD97 <cad97@cad97.com>2020-05-21 00:55:00 -0400
commitc25b82f5bb9770374db31906dedb497034a151fd (patch)
tree00fe398ec15a3d92ed6e04d583fba2f85695b33b
parent96f387920c21a83fa620b1838066fd4c73c4b486 (diff)
downloadrust-c25b82f5bb9770374db31906dedb497034a151fd.tar.gz
rust-c25b82f5bb9770374db31906dedb497034a151fd.zip
Use Step::forward_unchecked in RangeInclusive::next
-rw-r--r--src/libcore/iter/range.rs6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/libcore/iter/range.rs b/src/libcore/iter/range.rs
index 6837aab7af1..3fa4cf2ca0d 100644
--- a/src/libcore/iter/range.rs
+++ b/src/libcore/iter/range.rs
@@ -646,7 +646,11 @@ impl<A: Step> Iterator for ops::RangeInclusive<A> {
         }
         let is_iterating = self.start < self.end;
         Some(if is_iterating {
-            let n = Step::forward(self.start.clone(), 1);
+            // SAFETY: just checked precondition
+            // We use the unchecked version here, because
+            // otherwise `for _ in '\0'..=char::MAX`
+            // does not successfully remove panicking code.
+            let n = unsafe { Step::forward_unchecked(self.start.clone(), 1) };
             mem::replace(&mut self.start, n)
         } else {
             self.exhausted = true;