about summary refs log tree commit diff
path: root/src/libstd/vec.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-02-21 09:46:49 -0800
committerbors <bors@rust-lang.org>2014-02-21 09:46:49 -0800
commitb5995b4e93237fe0d1c0ea76e33eb2429f654487 (patch)
tree0a71ca876e0bdd52f90f6f0a0b24c766ea4ce82d /src/libstd/vec.rs
parentf8893ed5d97180dc51d82df1bdbab989c4bde46d (diff)
parent3a9eca3a7be3ea156147fb8ed00a6447112e74d7 (diff)
downloadrust-b5995b4e93237fe0d1c0ea76e33eb2429f654487.tar.gz
rust-b5995b4e93237fe0d1c0ea76e33eb2429f654487.zip
auto merge of #12326 : bjz/rust/integer, r=alexcrichton
This is part of the effort to simplify `std::num`, as tracked in issue #10387.
Diffstat (limited to 'src/libstd/vec.rs')
-rw-r--r--src/libstd/vec.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/vec.rs b/src/libstd/vec.rs
index 5a42df0a389..0adc6083f6b 100644
--- a/src/libstd/vec.rs
+++ b/src/libstd/vec.rs
@@ -111,7 +111,7 @@ use cmp;
 use default::Default;
 use fmt;
 use iter::*;
-use num::{Integer, CheckedAdd, Saturating, checked_next_power_of_two};
+use num::{CheckedAdd, Saturating, checked_next_power_of_two, div_rem};
 use option::{None, Option, Some};
 use ptr;
 use ptr::RawPtr;
@@ -575,7 +575,7 @@ impl<'a, T> Iterator<&'a [T]> for Chunks<'a, T> {
         if self.v.len() == 0 {
             (0, Some(0))
         } else {
-            let (n, rem) = self.v.len().div_rem(&self.size);
+            let (n, rem) = div_rem(self.v.len(), self.size);
             let n = if rem > 0 { n+1 } else { n };
             (n, Some(n))
         }
@@ -2859,7 +2859,7 @@ impl<'a, T> Iterator<&'a mut [T]> for MutChunks<'a, T> {
         if self.v.len() == 0 {
             (0, Some(0))
         } else {
-            let (n, rem) = self.v.len().div_rem(&self.chunk_size);
+            let (n, rem) = div_rem(self.v.len(), self.chunk_size);
             let n = if rem > 0 { n + 1 } else { n };
             (n, Some(n))
         }