Skip to content

Commit 0ff5c17

Browse files
author
blake2-ppc
committed
deque: Implement Deque::with_capacity. Lower initial capacity to 8.
We need a reasonably small initial capacity to make Deques faster for the common case.
1 parent 8a32676 commit 0ff5c17

File tree

1 file changed

+18
-2
lines changed

1 file changed

+18
-2
lines changed

src/libextra/deque.rs

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ use std::uint;
1414
use std::vec;
1515
use std::iterator::FromIterator;
1616

17-
static INITIAL_CAPACITY: uint = 32u; // 2^5
17+
static INITIAL_CAPACITY: uint = 8u; // 2^3
18+
static MINIMUM_CAPACITY: uint = 2u;
1819

1920
#[allow(missing_doc)]
2021
pub struct Deque<T> {
@@ -43,8 +44,13 @@ impl<T> Mutable for Deque<T> {
4344
impl<T> Deque<T> {
4445
/// Create an empty Deque
4546
pub fn new() -> Deque<T> {
47+
Deque::with_capacity(INITIAL_CAPACITY)
48+
}
49+
50+
/// Create an empty Deque with space for at least `n` elements.
51+
pub fn with_capacity(n: uint) -> Deque<T> {
4652
Deque{nelts: 0, lo: 0,
47-
elts: vec::from_fn(INITIAL_CAPACITY, |_| None)}
53+
elts: vec::from_fn(uint::max(MINIMUM_CAPACITY, n), |_| None)}
4854
}
4955

5056
/// Return a reference to the first element in the deque
@@ -527,6 +533,16 @@ mod tests {
527533

528534
}
529535

536+
#[test]
537+
fn test_with_capacity() {
538+
let mut d = Deque::with_capacity(0);
539+
d.add_back(1);
540+
assert_eq!(d.len(), 1);
541+
let mut d = Deque::with_capacity(50);
542+
d.add_back(1);
543+
assert_eq!(d.len(), 1);
544+
}
545+
530546
#[test]
531547
fn test_reserve() {
532548
let mut d = Deque::new();

0 commit comments

Comments
 (0)