Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert #83357 and achieve the same impact on serde-json by adding a check in Vec::spec_extend #83797

Closed
wants to merge 3 commits into from
Closed

Revert #83357 and achieve the same impact on serde-json by adding a check in Vec::spec_extend #83797

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
42f909a
Revert #83357
saethlin Apr 2, 2021
0dc772e
Check before calling Vec::reserve in spec_extend
saethlin Apr 2, 2021
85bd865
Revert "Check before calling Vec::reserve in spec_extend"
saethlin Apr 3, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 1 addition & 17 deletions library/alloc/src/raw_vec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,24 +315,8 @@ impl<T, A: Allocator> RawVec<T, A> {
/// # vector.push_all(&[1, 3, 5, 7, 9]);
/// # }
/// ```
#[inline]
pub fn reserve(&mut self, len: usize, additional: usize) {
// Callers expect this function to be very cheap when there is already sufficient capacity.
// Therefore, we move all the resizing and error-handling logic from grow_amortized and
// handle_reserve behind a call, while making sure that the this function is likely to be
// inlined as just a comparison and a call if the comparison fails.
#[cold]
fn do_reserve_and_handle<T, A: Allocator>(
slf: &mut RawVec<T, A>,
len: usize,
additional: usize,
) {
handle_reserve(slf.grow_amortized(len, additional));
}

if self.needs_to_grow(len, additional) {
do_reserve_and_handle(self, len, additional);
}
handle_reserve(self.try_reserve(len, additional));
}

/// The same as `reserve`, but returns on errors instead of panicking or aborting.
Expand Down