Skip to content

Commit 2b7520f

Browse files
toffalettibrson
authored andcommitted
---
yaml --- r: 95679 b: refs/heads/dist-snap c: 5e91ac1 h: refs/heads/master i: 95677: 0e58152 95675: 84d88a3 95671: 5627ae1 95663: 65715dc 95647: 8d22c94 95615: 96de68d v: v3
1 parent 9fa2549 commit 2b7520f

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: c274a6888410ce3e357e014568b43310ed787d36
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
9-
refs/heads/dist-snap: 8c95f558d0f3acb5ea301acb631d0d616d61c7b6
9+
refs/heads/dist-snap: 5e91ac10b65a4c20915868d3af3c06f1d3d3cada
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1212
refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/libstd/rt/mpmc_bounded_queue.rs

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,12 @@ struct Queue<T> {
5757
impl<T: Send> State<T> {
5858
fn with_capacity(capacity: uint) -> State<T> {
5959
let capacity = if capacity < 2 || (capacity & (capacity - 1)) != 0 {
60-
// use next power of 2 as capacity
61-
2f64.pow(&((capacity as f64).log2().floor()+1f64)) as uint
60+
if capacity < 2 {
61+
2u
62+
} else {
63+
// use next power of 2 as capacity
64+
2f64.pow(&((capacity as f64).log2().ceil())) as uint
65+
}
6266
} else {
6367
capacity
6468
};

0 commit comments

Comments
 (0)