Skip to content

Commit 24a4d0d

Browse files
author
blake2-ppc
committed
std::vec: Sane implementations for connect_vec and concat_vec
Avoid unnecessary copying of subvectors, and calculate the needed space beforehand. These implementations are simple but better than the previous. Also only implement it once, for all `Vector<T>` using: impl<'self, T: Clone, V: Vector<T>> VectorVector<T> for &'self [V] performance improved according to the bench test: before test vec::bench::concat ... bench: 74818 ns/iter (+/- 408) test vec::bench::connect ... bench: 87066 ns/iter (+/- 376) after test vec::bench::concat ... bench: 17724 ns/iter (+/- 126) test vec::bench::connect ... bench: 18353 ns/iter (+/- 691) Closes #9581
1 parent 5444f60 commit 24a4d0d

File tree

1 file changed

+15
-26
lines changed

1 file changed

+15
-26
lines changed

src/libstd/vec.rs

Lines changed: 15 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -356,43 +356,32 @@ pub fn connect_slices<T:Clone>(v: &[&[T]], sep: &T) -> ~[T] { v.connect_vec(sep)
356356
pub trait VectorVector<T> {
357357
// FIXME #5898: calling these .concat and .connect conflicts with
358358
// StrVector::con{cat,nect}, since they have generic contents.
359+
/// Flattens a vector of vectors of T into a single vector of T.
359360
fn concat_vec(&self) -> ~[T];
360-
fn connect_vec(&self, sep: &T) -> ~[T];
361-
}
362-
363-
impl<'self, T:Clone> VectorVector<T> for &'self [~[T]] {
364-
/// Flattens a vector of slices of T into a single vector of T.
365-
fn concat_vec(&self) -> ~[T] {
366-
self.flat_map(|inner| (*inner).clone())
367-
}
368361

369362
/// Concatenate a vector of vectors, placing a given separator between each.
370-
fn connect_vec(&self, sep: &T) -> ~[T] {
371-
let mut r = ~[];
372-
let mut first = true;
373-
for inner in self.iter() {
374-
if first { first = false; } else { r.push((*sep).clone()); }
375-
r.push_all((*inner).clone());
376-
}
377-
r
378-
}
363+
fn connect_vec(&self, sep: &T) -> ~[T];
379364
}
380365

381-
impl<'self,T:Clone> VectorVector<T> for &'self [&'self [T]] {
382-
/// Flattens a vector of slices of T into a single vector of T.
366+
impl<'self, T: Clone, V: Vector<T>> VectorVector<T> for &'self [V] {
383367
fn concat_vec(&self) -> ~[T] {
384-
self.flat_map(|&inner| inner.to_owned())
368+
let size = self.iter().fold(0u, |acc, v| acc + v.as_slice().len());
369+
let mut result = with_capacity(size);
370+
for v in self.iter() {
371+
result.push_all(v.as_slice())
372+
}
373+
result
385374
}
386375

387-
/// Concatenate a vector of slices, placing a given separator between each.
388376
fn connect_vec(&self, sep: &T) -> ~[T] {
389-
let mut r = ~[];
377+
let size = self.iter().fold(0u, |acc, v| acc + v.as_slice().len());
378+
let mut result = with_capacity(size + self.len());
390379
let mut first = true;
391-
for &inner in self.iter() {
392-
if first { first = false; } else { r.push((*sep).clone()); }
393-
r.push_all(inner);
380+
for v in self.iter() {
381+
if first { first = false } else { result.push(sep.clone()) }
382+
result.push_all(v.as_slice())
394383
}
395-
r
384+
result
396385
}
397386
}
398387

0 commit comments

Comments
 (0)