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/sync/mpmc_bounded_queue.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/sync/mpmc_bounded_queue.rs')
| -rw-r--r-- | src/libstd/sync/mpmc_bounded_queue.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/sync/mpmc_bounded_queue.rs b/src/libstd/sync/mpmc_bounded_queue.rs index bb0e96f96de..74f3a6f6918 100644 --- a/src/libstd/sync/mpmc_bounded_queue.rs +++ b/src/libstd/sync/mpmc_bounded_queue.rs @@ -31,10 +31,10 @@ use clone::Clone; use kinds::Send; +use num::next_power_of_two; use option::{Option, Some, None}; use sync::arc::UnsafeArc; use sync::atomics::{AtomicUint,Relaxed,Release,Acquire}; -use uint; use vec; struct Node<T> { @@ -64,7 +64,7 @@ impl<T: Send> State<T> { 2u } else { // use next power of 2 as capacity - uint::next_power_of_two(capacity) + next_power_of_two(capacity) } } else { capacity |