diff options
| author | bors <bors@rust-lang.org> | 2019-06-06 12:13:54 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-06-06 12:13:54 +0000 |
| commit | 8b36867093fb774bcbd9f787cbc470a5f44c1310 (patch) | |
| tree | 9f022f65d4d0496722d8c7a80c0ee7a5d15f1a56 /src/libcore | |
| parent | 51dc52b9fe432a87ebbd5347fb64c1d9edc06b3e (diff) | |
| parent | 97a2acd0a02790fddf9955b9723d3551846778c8 (diff) | |
| download | rust-8b36867093fb774bcbd9f787cbc470a5f44c1310.tar.gz rust-8b36867093fb774bcbd9f787cbc470a5f44c1310.zip | |
Auto merge of #61583 - Centril:rollup-ug2cbfd, r=Centril
Rollup of 4 pull requests Successful merges: - #61556 (librustc_errors: Rename AnnotateRs -> AnnotateSnippet) - #61557 (rustbuild: Include `rustfmt` in deduplicated dependencies) - #61571 (Escape HashMap with backticks in needs_drop docs) - #61582 (submodules: update clippy from 20da8f45 to 71be6f62) Failed merges: r? @ghost
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/mem/mod.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libcore/mem/mod.rs b/src/libcore/mem/mod.rs index 91449f09936..b43ba6ac340 100644 --- a/src/libcore/mem/mod.rs +++ b/src/libcore/mem/mod.rs @@ -374,13 +374,13 @@ pub fn align_of_val<T: ?Sized>(val: &T) -> usize { /// will do a single needs_drop check for all the values. /// /// Types like Vec therefore just `drop_in_place(&mut self[..])` without using -/// needs_drop explicitly. Types like HashMap, on the other hand, have to drop +/// needs_drop explicitly. Types like `HashMap`, on the other hand, have to drop /// values one at a time and should use this API. /// /// /// # Examples /// -/// Here's an example of how a collection might make use of needs_drop: +/// Here's an example of how a collection might make use of `needs_drop`: /// /// ``` /// use std::{mem, ptr}; |
