Skip to content

Commit f6216b2

Browse files
committed
Auto merge of rust-lang#48294 - GuillaumeGomez:rollup, r=GuillaumeGomez
Rollup of 8 pull requests - Successful merges: rust-lang#48095, rust-lang#48152, rust-lang#48234, rust-lang#48239, rust-lang#48243, rust-lang#48260, rust-lang#48284, rust-lang#48286 - Failed merges:
2 parents b298607 + 47db61a commit f6216b2

File tree

10 files changed

+2185
-1775
lines changed

10 files changed

+2185
-1775
lines changed

src/liballoc/vec.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -231,9 +231,9 @@ use Bound::{Excluded, Included, Unbounded};
231231
///
232232
/// If a `Vec` *has* allocated memory, then the memory it points to is on the heap
233233
/// (as defined by the allocator Rust is configured to use by default), and its
234-
/// pointer points to [`len`] initialized elements in order (what you would see
235-
/// if you coerced it to a slice), followed by [`capacity`]` - `[`len`]
236-
/// logically uninitialized elements.
234+
/// pointer points to [`len`] initialized, contiguous elements in order (what
235+
/// you would see if you coerced it to a slice), followed by [`capacity`]` -
236+
/// `[`len`] logically uninitialized, contiguous elements.
237237
///
238238
/// `Vec` will never perform a "small optimization" where elements are actually
239239
/// stored on the stack for two reasons:
@@ -281,8 +281,8 @@ use Bound::{Excluded, Included, Unbounded};
281281
/// not break, however: using `unsafe` code to write to the excess capacity,
282282
/// and then increasing the length to match, is always valid.
283283
///
284-
/// `Vec` does not currently guarantee the order in which elements are dropped
285-
/// (the order has changed in the past, and may change again).
284+
/// `Vec` does not currently guarantee the order in which elements are dropped.
285+
/// The order has changed in the past and may change again.
286286
///
287287
/// [`vec!`]: ../../std/macro.vec.html
288288
/// [`Index`]: ../../std/ops/trait.Index.html

0 commit comments

Comments
 (0)