diff options
| author | bors <bors@rust-lang.org> | 2022-07-03 09:36:37 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-07-03 09:36:37 +0000 |
| commit | f99f9e48ed77a99747c6d07b42fdfe500f1a7de0 (patch) | |
| tree | 049ae0507ab329ca285c127d1555c7d48d0b62bc /library | |
| parent | ada8c80bedb713b320af00aacab97d01d9cb5933 (diff) | |
| parent | 679c5ee244f997a563af45e335681e16fc089b34 (diff) | |
| download | rust-f99f9e48ed77a99747c6d07b42fdfe500f1a7de0.tar.gz rust-f99f9e48ed77a99747c6d07b42fdfe500f1a7de0.zip | |
Auto merge of #98755 - nnethercote:faster-vec-insert, r=cuviper
Optimize `Vec::insert` for the case where `index == len`. By skipping the call to `copy` with a zero length. This makes it closer to `push`. I did this recently for `SmallVec` (https://github.com/servo/rust-smallvec/pull/282) and it was a big perf win in one case. Although I don't have a specific use case in mind, it seems worth doing it for `Vec` as well. Things to note: - In the `index < len` case, the number of conditions checked is unchanged. - In the `index == len` case, the number of conditions checked increases by one, but the more expensive zero-length copy is avoided. - In the `index > len` case the code now reserves space for the extra element before panicking. This seems like an unimportant change. r? `@cuviper`
Diffstat (limited to 'library')
| -rw-r--r-- | library/alloc/src/vec/mod.rs | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/library/alloc/src/vec/mod.rs b/library/alloc/src/vec/mod.rs index 05370576661..fa9f2131c0c 100644 --- a/library/alloc/src/vec/mod.rs +++ b/library/alloc/src/vec/mod.rs @@ -1379,9 +1379,6 @@ impl<T, A: Allocator> Vec<T, A> { } let len = self.len(); - if index > len { - assert_failed(index, len); - } // space for the new element if len == self.buf.capacity() { @@ -1393,9 +1390,15 @@ impl<T, A: Allocator> Vec<T, A> { // The spot to put the new value { let p = self.as_mut_ptr().add(index); - // Shift everything over to make space. (Duplicating the - // `index`th element into two consecutive places.) - ptr::copy(p, p.offset(1), len - index); + if index < len { + // Shift everything over to make space. (Duplicating the + // `index`th element into two consecutive places.) + ptr::copy(p, p.offset(1), len - index); + } else if index == len { + // No elements need shifting. + } else { + assert_failed(index, len); + } // Write it in, overwriting the first copy of the `index`th // element. ptr::write(p, element); |
