Skip to content

Vec::grow should use reserve_additional, Vec::reserve should check against capacity #15372

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

Closed
wants to merge 2 commits into from
Closed

Vec::grow should use reserve_additional, Vec::reserve should check against capacity #15372

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ed5d83
collections: grow should use the overflow-checked reserve_additional
erickt Jul 3, 2014
128edc3
collections: Fix conditional when reserving extra vec space
erickt Jul 3, 2014
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
5 changes: 2 additions & 3 deletions src/libcollections/vec.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,7 @@ impl<T: Clone> Vec<T> {
/// assert_eq!(vec, vec!("hello", "world", "world"));
/// ```
pub fn grow(&mut self, n: uint, value: &T) {
let new_len = self.len() + n;
self.reserve(new_len);
self.reserve_additional(n);
let mut i: uint = 0u;

while i < n {
Expand Down Expand Up @@ -497,7 +496,7 @@ impl<T> Vec<T> {
/// assert!(vec.capacity() >= 10);
/// ```
pub fn reserve(&mut self, capacity: uint) {
if capacity >= self.len {
if capacity > self.cap {
self.reserve_exact(num::next_power_of_two(capacity))
}
}
Expand Down