diff options
| author | bors <bors@rust-lang.org> | 2020-06-29 12:00:31 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-06-29 12:00:31 +0000 |
| commit | 0ca7f74dbd23a3e8ec491cd3438f490a3ac22741 (patch) | |
| tree | d93b1cb38086e18e8d58ab3d6e422982bd7196f1 /src/liballoc | |
| parent | c86039b33343de264d8b3b1a9e3591b10d5615e8 (diff) | |
| parent | 31c6d5f35e3357d55411ba2057101a854d229d8a (diff) | |
| download | rust-0ca7f74dbd23a3e8ec491cd3438f490a3ac22741.tar.gz rust-0ca7f74dbd23a3e8ec491cd3438f490a3ac22741.zip | |
Auto merge of #73391 - pickfire:liballoc-panic-doc, r=Mark-Simulacrum
Add liballoc doc panic detail according to RawVec
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/raw_vec.rs | 12 | ||||
| -rw-r--r-- | src/liballoc/vec.rs | 4 |
2 files changed, 5 insertions, 11 deletions
diff --git a/src/liballoc/raw_vec.rs b/src/liballoc/raw_vec.rs index 67ebdcc9f33..b2cf98a5de6 100644 --- a/src/liballoc/raw_vec.rs +++ b/src/liballoc/raw_vec.rs @@ -80,9 +80,7 @@ impl<T> RawVec<T, Global> { /// /// # Panics /// - /// * Panics if the requested capacity exceeds `usize::MAX` bytes. - /// * Panics on 32-bit platforms if the requested capacity exceeds - /// `isize::MAX` bytes. + /// Panics if the requested capacity exceeds `isize::MAX` bytes. /// /// # Aborts /// @@ -251,9 +249,7 @@ impl<T, A: AllocRef> RawVec<T, A> { /// /// # Panics /// - /// * Panics if the requested capacity exceeds `usize::MAX` bytes. - /// * Panics on 32-bit platforms if the requested capacity exceeds - /// `isize::MAX` bytes. + /// Panics if the new capacity exceeds `isize::MAX` bytes. /// /// # Aborts /// @@ -318,9 +314,7 @@ impl<T, A: AllocRef> RawVec<T, A> { /// /// # Panics /// - /// * Panics if the requested capacity exceeds `usize::MAX` bytes. - /// * Panics on 32-bit platforms if the requested capacity exceeds - /// `isize::MAX` bytes. + /// Panics if the new capacity exceeds `isize::MAX` bytes. /// /// # Aborts /// diff --git a/src/liballoc/vec.rs b/src/liballoc/vec.rs index c2cf64393ad..5db96a504a6 100644 --- a/src/liballoc/vec.rs +++ b/src/liballoc/vec.rs @@ -491,7 +491,7 @@ impl<T> Vec<T> { /// /// # Panics /// - /// Panics if the new capacity overflows `usize`. + /// Panics if the new capacity exceeds `isize::MAX` bytes. /// /// # Examples /// @@ -1188,7 +1188,7 @@ impl<T> Vec<T> { /// /// # Panics /// - /// Panics if the number of elements in the vector overflows a `usize`. + /// Panics if the new capacity exceeds `isize::MAX` bytes. /// /// # Examples /// |