diff options
| author | bors <bors@rust-lang.org> | 2018-02-17 14:31:32 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-02-17 14:31:32 +0000 |
| commit | f6216b2d556afba2fdab906409582cb5471eafe0 (patch) | |
| tree | e7e19978566964b0def4552fdcb0e8f454b48d69 /src/liballoc | |
| parent | b298607864b76ea6b7b7a4b8bb482472f1604c8d (diff) | |
| parent | 47db61a3c39da4066cb0b5fa83ddb36e649df7f5 (diff) | |
| download | rust-f6216b2d556afba2fdab906409582cb5471eafe0.tar.gz rust-f6216b2d556afba2fdab906409582cb5471eafe0.zip | |
Auto merge of #48294 - GuillaumeGomez:rollup, r=GuillaumeGomez
Rollup of 8 pull requests - Successful merges: #48095, #48152, #48234, #48239, #48243, #48260, #48284, #48286 - Failed merges:
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/vec.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/liballoc/vec.rs b/src/liballoc/vec.rs index 5c7f8ef7321..39a4d271bd6 100644 --- a/src/liballoc/vec.rs +++ b/src/liballoc/vec.rs @@ -231,9 +231,9 @@ use Bound::{Excluded, Included, Unbounded}; /// /// If a `Vec` *has* allocated memory, then the memory it points to is on the heap /// (as defined by the allocator Rust is configured to use by default), and its -/// pointer points to [`len`] initialized elements in order (what you would see -/// if you coerced it to a slice), followed by [`capacity`]` - `[`len`] -/// logically uninitialized elements. +/// pointer points to [`len`] initialized, contiguous elements in order (what +/// you would see if you coerced it to a slice), followed by [`capacity`]` - +/// `[`len`] logically uninitialized, contiguous elements. /// /// `Vec` will never perform a "small optimization" where elements are actually /// stored on the stack for two reasons: @@ -281,8 +281,8 @@ use Bound::{Excluded, Included, Unbounded}; /// not break, however: using `unsafe` code to write to the excess capacity, /// and then increasing the length to match, is always valid. /// -/// `Vec` does not currently guarantee the order in which elements are dropped -/// (the order has changed in the past, and may change again). +/// `Vec` does not currently guarantee the order in which elements are dropped. +/// The order has changed in the past and may change again. /// /// [`vec!`]: ../../std/macro.vec.html /// [`Index`]: ../../std/ops/trait.Index.html |
