about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-11-28 07:31:26 +0000
committerbors <bors@rust-lang.org>2014-11-28 07:31:26 +0000
commit832dc619ec1dcaa929de3a4eec440dffd3bedd06 (patch)
tree4606abe731b60f46da3eae745fb63e548a142196 /src/libstd
parentdbbb722f253060401f672d590db544ac02b1c81e (diff)
parentf01cbaa0baf034850575f75b3724be207c56c41f (diff)
downloadrust-832dc619ec1dcaa929de3a4eec440dffd3bedd06.tar.gz
rust-832dc619ec1dcaa929de3a4eec440dffd3bedd06.zip
auto merge of #19360 : olivren/rust/master, r=Gankro
The previous code was giving an incorrect result (not x/3).

Also, this function does not work with signed integers. It now accepts `u32` instead of `i32`.
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/macros.rs9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/libstd/macros.rs b/src/libstd/macros.rs
index 12ca80bfaab..76419bee41c 100644
--- a/src/libstd/macros.rs
+++ b/src/libstd/macros.rs
@@ -217,12 +217,11 @@ macro_rules! debug_assert_eq(
 /// Iterators:
 ///
 /// ```rust
-/// fn divide_by_three(x: i32) -> i32 { // one of the poorest implementations of x/3
-///     for i in std::iter::count(0_i32, 1) {
-///         if i < 0 { panic!("i32 overflow"); }
-///         if x < 3*i { return i; }
+/// fn divide_by_three(x: u32) -> u32 { // one of the poorest implementations of x/3
+///     for i in std::iter::count(0_u32, 1) {
+///         if 3*i < i { panic!("u32 overflow"); }
+///         if x < 3*i { return i-1; }
 ///     }
-///
 ///     unreachable!();
 /// }
 /// ```