diff options
| author | bors <bors@rust-lang.org> | 2019-01-15 13:56:16 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-01-15 13:56:16 +0000 |
| commit | 14ea6e50c1534a23cb51375552c14568db9ee130 (patch) | |
| tree | 6758b33999db15ce1380535345a94afb2cb8d788 /src/liballoc | |
| parent | 920192490f3eea0cf3b2e58e28912eb68423fdde (diff) | |
| parent | 9947b3060c165ef2677c0e0454991a53ef743224 (diff) | |
| download | rust-14ea6e50c1534a23cb51375552c14568db9ee130.tar.gz rust-14ea6e50c1534a23cb51375552c14568db9ee130.zip | |
Auto merge of #57630 - Centril:rollup, r=Centril
Rollup of 8 pull requests Successful merges: - #56044 (Drop partially bound function parameters in the expected order) - #57352 (forbid manually impl'ing one of an object type's marker traits) - #57456 (RawVec doesn't always abort on allocation errors) - #57467 (Implement `check_attribute` to forbid `#[allow_internal_unsafe]`) - #57579 (Add core::iter::once_with()) - #57587 (Add 'rustc-env:RUST_BACKTRACE=0' to const-pat-ice test) - #57608 (Simplify 'product' factorial example) - #57614 ([rustdoc] Fix crates filtering box not being filled) Failed merges: r? @ghost
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/raw_vec.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/liballoc/raw_vec.rs b/src/liballoc/raw_vec.rs index c05452bcf4d..5e4aac9ce78 100644 --- a/src/liballoc/raw_vec.rs +++ b/src/liballoc/raw_vec.rs @@ -22,7 +22,7 @@ use boxed::Box; /// * Catches all overflows in capacity computations (promotes them to "capacity overflow" panics) /// * Guards against 32-bit systems allocating more than isize::MAX bytes /// * Guards against overflowing your length -/// * Aborts on OOM +/// * Aborts on OOM or calls handle_alloc_error as applicable /// * Avoids freeing Unique::empty() /// * Contains a ptr::Unique and thus endows the user with all related benefits /// |