Skip to content

Commit

Permalink
Auto merge of rust-lang#73391 - pickfire:liballoc-panic-doc, r=Mark-S…
Browse files Browse the repository at this point in the history
…imulacrum

Add liballoc doc panic detail according to RawVec
  • Loading branch information
bors committed Jun 29, 2020
2 parents c86039b + 31c6d5f commit 0ca7f74
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 11 deletions.
12 changes: 3 additions & 9 deletions src/liballoc/raw_vec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
///
Expand Down Expand Up @@ -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
///
Expand Down Expand Up @@ -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
///
Expand Down
4 changes: 2 additions & 2 deletions src/liballoc/vec.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
///
Expand Down Expand Up @@ -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
///
Expand Down

0 comments on commit 0ca7f74

Please sign in to comment.