Auto merge of rust-lang#23251 - tbu-:pr_rm_core_str_checked_add, r=al…

…excrichton
steveklabnik · Mar 11, 2015 · f899513 · f899513
2 parents cfea8ec + 5199a70
commit f899513
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/libcore/str/mod.rs b/src/libcore/str/mod.rs
@@ -442,7 +442,10 @@ impl<'a> Iterator for Chars<'a> {
     #[inline]
     fn size_hint(&self) -> (usize, Option<usize>) {
         let (len, _) = self.iter.size_hint();
-        (len.saturating_add(3) / 4, Some(len))
+        // `(len + 3)` can't overflow, because we know that the `slice::Iter`
+        // belongs to a slice in memory which has a maximum length of
+        // `isize::MAX` (that's well below `usize::MAX`).
+        ((len + 3) / 4, Some(len))
     }
 }