diff options
| author | The 8472 <git@infinite-source.de> | 2022-08-13 12:58:17 +0200 |
|---|---|---|
| committer | The 8472 <git@infinite-source.de> | 2022-08-13 12:58:17 +0200 |
| commit | bb74f97445f04d68e42e7e308a109f78a2d2b0f7 (patch) | |
| tree | 81558d507c9e9a3ff201251aa10c363927ee48fd /library/alloc/src | |
| parent | 46396e847d56037cbbf31dfccccbc0b45332af74 (diff) | |
| download | rust-bb74f97445f04d68e42e7e308a109f78a2d2b0f7.tar.gz rust-bb74f97445f04d68e42e7e308a109f78a2d2b0f7.zip | |
address review comments, add tracking issue
Diffstat (limited to 'library/alloc/src')
| -rw-r--r-- | library/alloc/src/vec/mod.rs | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/library/alloc/src/vec/mod.rs b/library/alloc/src/vec/mod.rs index 1dccb053f90..f36dfbf3009 100644 --- a/library/alloc/src/vec/mod.rs +++ b/library/alloc/src/vec/mod.rs @@ -1773,9 +1773,10 @@ impl<T, A: Allocator> Vec<T, A> { } } - /// Appends an element if there is sufficient spare capacity, otherwise the element is returned. + /// Appends an element if there is sufficient spare capacity, otherwise an error is returned + /// with the element. /// - /// Unlike [`push`] method will not reallocate when there's insufficient capacity. + /// Unlike [`push`] this method will not reallocate when there's insufficient capacity. /// The caller should use [`reserve`] or [`try_reserve`] to ensure that there is enough capacity. /// /// [`push`]: Vec::push @@ -1784,13 +1785,13 @@ impl<T, A: Allocator> Vec<T, A> { /// /// # Examples /// - /// A manual, panic-free alternative to FromIterator + /// A manual, panic-free alternative to [`FromIterator`]: /// /// ``` - /// #![feature(vec_push_within_capacity, try_reserve)] + /// #![feature(vec_push_within_capacity)] /// /// use std::collections::TryReserveError; - /// fn from_iter<T>(iter: impl Iterator<Item=T>) -> Result<Vec<T>, TryReserveError> { + /// fn from_iter_fallible<T>(iter: impl Iterator<Item=T>) -> Result<Vec<T>, TryReserveError> { /// let mut vec = Vec::new(); /// for value in iter { /// if let Err(value) = vec.push_within_capacity(value) { @@ -1801,10 +1802,10 @@ impl<T, A: Allocator> Vec<T, A> { /// } /// Ok(vec) /// } - /// # from_iter(0..100).expect("please insert more memory"); + /// assert_eq!(from_iter_fallible(0..100), Ok(Vec::from_iter(0..100))); /// ``` #[inline] - #[unstable(feature = "vec_push_within_capacity", issue = "none")] + #[unstable(feature = "vec_push_within_capacity", issue = "100486")] pub fn push_within_capacity(&mut self, value: T) -> Result<(), T> { if self.len == self.buf.capacity() { return Err(value); |
