diff options
| author | bors <bors@rust-lang.org> | 2018-09-25 22:52:16 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-09-25 22:52:16 +0000 |
| commit | 92aff72a0503baa6cf0448555f649957de802b03 (patch) | |
| tree | 7d88f60555c884da79b470c76d1afa299b195f74 /src/libstd | |
| parent | 4141a4079e3e6b2c4ac104fed042a9b7241467eb (diff) | |
| parent | cc9dea43be5ab201421b41dbb027f6ba36973cac (diff) | |
| download | rust-92aff72a0503baa6cf0448555f649957de802b03.tar.gz rust-92aff72a0503baa6cf0448555f649957de802b03.zip | |
Auto merge of #54575 - pietroalbini:rollup, r=pietroalbini
Rollup of 12 pull requests Successful merges: - #53518 (Add doc for impl From in char_convert) - #54058 (Introduce the partition_dedup/by/by_key methods for slices) - #54281 (Search box) - #54368 (Reduce code block sides padding) - #54498 (The project moved under the Mozilla umbrella) - #54518 (resolve: Do not block derive helper resolutions on single import resolutions) - #54522 (Fixed three small typos.) - #54529 (aarch64-pc-windows-msvc: Don't link libpanic_unwind to libtest.) - #54537 (Rename slice::exact_chunks() to slice::chunks_exact()) - #54539 (Fix js error) - #54557 (incr.comp.: Don't automatically enable -Zshare-generics for incr. comp. builds.) - #54558 (Improvements to finding LLVM's FileCheck) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/primitive_docs.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/primitive_docs.rs b/src/libstd/primitive_docs.rs index 4c1fdc4f895..8d54728a75f 100644 --- a/src/libstd/primitive_docs.rs +++ b/src/libstd/primitive_docs.rs @@ -208,7 +208,7 @@ mod prim_bool { } /// # `!` and traits /// /// When writing your own traits, `!` should have an `impl` whenever there is an obvious `impl` -/// which doesn't `panic!`. As is turns out, most traits can have an `impl` for `!`. Take [`Debug`] +/// which doesn't `panic!`. As it turns out, most traits can have an `impl` for `!`. Take [`Debug`] /// for example: /// /// ``` @@ -228,9 +228,9 @@ mod prim_bool { } /// [`fmt::Result`]. Since this method takes a `&!` as an argument we know that it can never be /// called (because there is no value of type `!` for it to be called with). Writing `*self` /// essentially tells the compiler "We know that this code can never be run, so just treat the -/// entire function body has having type [`fmt::Result`]". This pattern can be used a lot when +/// entire function body as having type [`fmt::Result`]". This pattern can be used a lot when /// implementing traits for `!`. Generally, any trait which only has methods which take a `self` -/// parameter should have such as impl. +/// parameter should have such an impl. /// /// On the other hand, one trait which would not be appropriate to implement is [`Default`]: /// |