diff options
| author | bors <bors@rust-lang.org> | 2024-02-27 00:55:14 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-02-27 00:55:14 +0000 |
| commit | 71ffdf7ff7ac6df5f9f64de7e780b8345797e8a0 (patch) | |
| tree | ae290c8dcb8654460eff1ca65a6ecafa8caf874d /library/alloc/src/vec/mod.rs | |
| parent | 5c786a7fe307acf8b0143e1186c8799840da4095 (diff) | |
| parent | ec5c5b7da8822122325d45625b9978fd3f05d84f (diff) | |
| download | rust-71ffdf7ff7ac6df5f9f64de7e780b8345797e8a0.tar.gz rust-71ffdf7ff7ac6df5f9f64de7e780b8345797e8a0.zip | |
Auto merge of #121655 - matthiaskrgr:rollup-qpx3kks, r=matthiaskrgr
Rollup of 4 pull requests
Successful merges:
- #121598 (rename 'try' intrinsic to 'catch_unwind')
- #121639 (Update books)
- #121648 (Update Vec and String `{from,into}_raw_parts`-family docs)
- #121651 (Properly emit `expected ;` on `#[attr] expr`)
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'library/alloc/src/vec/mod.rs')
| -rw-r--r-- | library/alloc/src/vec/mod.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/library/alloc/src/vec/mod.rs b/library/alloc/src/vec/mod.rs index b59699219eb..7bd19875584 100644 --- a/library/alloc/src/vec/mod.rs +++ b/library/alloc/src/vec/mod.rs @@ -481,7 +481,7 @@ impl<T> Vec<T> { Self::with_capacity_in(capacity, Global) } - /// Creates a `Vec<T>` directly from a pointer, a capacity, and a length. + /// Creates a `Vec<T>` directly from a pointer, a length, and a capacity. /// /// # Safety /// @@ -672,7 +672,7 @@ impl<T, A: Allocator> Vec<T, A> { Vec { buf: RawVec::with_capacity_in(capacity, alloc), len: 0 } } - /// Creates a `Vec<T, A>` directly from a pointer, a capacity, a length, + /// Creates a `Vec<T, A>` directly from a pointer, a length, a capacity, /// and an allocator. /// /// # Safety @@ -786,7 +786,7 @@ impl<T, A: Allocator> Vec<T, A> { unsafe { Vec { buf: RawVec::from_raw_parts_in(ptr, capacity, alloc), len: length } } } - /// Decomposes a `Vec<T>` into its raw components. + /// Decomposes a `Vec<T>` into its raw components: `(pointer, length, capacity)`. /// /// Returns the raw pointer to the underlying data, the length of /// the vector (in elements), and the allocated capacity of the @@ -824,7 +824,7 @@ impl<T, A: Allocator> Vec<T, A> { (me.as_mut_ptr(), me.len(), me.capacity()) } - /// Decomposes a `Vec<T>` into its raw components. + /// Decomposes a `Vec<T>` into its raw components: `(pointer, length, capacity, allocator)`. /// /// Returns the raw pointer to the underlying data, the length of the vector (in elements), /// the allocated capacity of the data (in elements), and the allocator. These are the same |
