diff options
| author | bors <bors@rust-lang.org> | 2014-02-01 04:11:21 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-02-01 04:11:21 -0800 |
| commit | 1d494198bbb9701b6336febcf9d0ceb39e4b7975 (patch) | |
| tree | 648f27b2e0b1f8d09b3a207b5d0ed2451ef01b4b /src/libstd/vec.rs | |
| parent | c80d28c8e322b6da49b7725d2b5e5b5cc86da822 (diff) | |
| parent | 1f15d24243078903410176a0924bd5d09fe1c2b8 (diff) | |
| download | rust-1d494198bbb9701b6336febcf9d0ceb39e4b7975.tar.gz rust-1d494198bbb9701b6336febcf9d0ceb39e4b7975.zip | |
auto merge of #11930 : bjz/rust/next_power_of_two, r=huonw
Diffstat (limited to 'src/libstd/vec.rs')
| -rw-r--r-- | src/libstd/vec.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/vec.rs b/src/libstd/vec.rs index 8e733686472..15cd5ce3343 100644 --- a/src/libstd/vec.rs +++ b/src/libstd/vec.rs @@ -109,7 +109,7 @@ use cmp::{Eq, TotalOrd, Ordering, Less, Equal, Greater}; use cmp; use default::Default; use iter::*; -use num::{Integer, CheckedAdd, Saturating}; +use num::{Integer, CheckedAdd, Saturating, checked_next_power_of_two}; use option::{None, Option, Some}; use ptr::to_unsafe_ptr; use ptr; @@ -1487,7 +1487,7 @@ impl<T> OwnedVector<T> for ~[T] { #[inline] fn reserve_at_least(&mut self, n: uint) { - self.reserve(uint::next_power_of_two_opt(n).unwrap_or(n)); + self.reserve(checked_next_power_of_two(n).unwrap_or(n)); } #[inline] |