diff options
| author | bors <bors@rust-lang.org> | 2019-06-04 05:37:44 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-06-04 05:37:44 +0000 |
| commit | c22ce2806c3198c9a2b90b78d00c5451593c833f (patch) | |
| tree | cddcdf9c039932b2d5d48e4e3a8c05ffd865c54c /src/liballoc/vec.rs | |
| parent | dc7c4aa804c4f26ba6de8a39d3c8eea88e8b8938 (diff) | |
| parent | 5baa58ea5f6d69e07054a3dde21e7b0ef8c75a1b (diff) | |
| download | rust-c22ce2806c3198c9a2b90b78d00c5451593c833f.tar.gz rust-c22ce2806c3198c9a2b90b78d00c5451593c833f.zip | |
Auto merge of #61510 - Centril:rollup-bvi95y2, r=Centril
Rollup of 13 pull requests Successful merges: - #61135 (Fix documentation of `Rc::make_mut` regarding `rc::Weak`.) - #61404 (miri unsizing: fix projecting into a field of an operand) - #61409 (Fix an ICE with a const argument in a trait) - #61413 (Re-implement async fn drop order lowering ) - #61419 (Add an unusual-conversion example to to_uppercase) - #61420 (Succinctify splice docs) - #61444 (Suggest using `as_ref` on `*const T`) - #61446 (On TerminatorKind::DropAndReplace still handle unused_mut correctly) - #61485 (azure: retry s3 upload if it fails) - #61489 (ci: Reenable step timings on AppVeyor) - #61496 (Do not panic in tidy on unbalanced parentheses in cfg's) - #61497 (Treat 0 as special value for codegen-units-std) - #61499 (Add regression test for existential type ICE #53457) Failed merges: r? @ghost
Diffstat (limited to 'src/liballoc/vec.rs')
| -rw-r--r-- | src/liballoc/vec.rs | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/liballoc/vec.rs b/src/liballoc/vec.rs index 5cb91395b7b..92fe0834dd0 100644 --- a/src/liballoc/vec.rs +++ b/src/liballoc/vec.rs @@ -2018,16 +2018,14 @@ impl<T> Vec<T> { /// with the given `replace_with` iterator and yields the removed items. /// `replace_with` does not need to be the same length as `range`. /// - /// Note 1: The element range is removed even if the iterator is not - /// consumed until the end. + /// The element range is removed even if the iterator is not consumed until the end. /// - /// Note 2: It is unspecified how many elements are removed from the vector, + /// It is unspecified how many elements are removed from the vector /// if the `Splice` value is leaked. /// - /// Note 3: The input iterator `replace_with` is only consumed - /// when the `Splice` value is dropped. + /// The input iterator `replace_with` is only consumed when the `Splice` value is dropped. /// - /// Note 4: This is optimal if: + /// This is optimal if: /// /// * The tail (elements in the vector after `range`) is empty, /// * or `replace_with` yields fewer elements than `range`’s length |
