diff options
| author | bors <bors@rust-lang.org> | 2020-07-23 08:56:45 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-07-23 08:56:45 +0000 |
| commit | 2bbfa02b1b15974d5772b520aa027bf79f8c248e (patch) | |
| tree | e7e74cc74874cf154f4b5c5ea97cf04c132c982d /src/liballoc | |
| parent | fcac11993ca055bbdc7683a2f6ed7b88a838fb0f (diff) | |
| parent | 8f02f2c1abd6c3fbd3053da5bb6759a4698a949e (diff) | |
| download | rust-2bbfa02b1b15974d5772b520aa027bf79f8c248e.tar.gz rust-2bbfa02b1b15974d5772b520aa027bf79f8c248e.zip | |
Auto merge of #74667 - Manishearth:rollup-s6k59sw, r=Manishearth
Rollup of 8 pull requests Successful merges: - #74141 (libstd/libcore: fix various typos) - #74490 (add a Backtrace::disabled function) - #74548 (one more Path::with_extension example, to demonstrate behavior) - #74587 (Prefer constant over function) - #74606 (Remove Linux workarounds for missing CLOEXEC support) - #74637 (Make str point to primitive page) - #74654 (require type defaults to be after const generic parameters) - #74659 (Improve codegen for unchecked float casts on wasm) Failed merges: r? @ghost
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/string.rs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/liballoc/string.rs b/src/liballoc/string.rs index 15f10df9a45..f41c8c5a559 100644 --- a/src/liballoc/string.rs +++ b/src/liballoc/string.rs @@ -65,7 +65,7 @@ use crate::vec::Vec; /// /// # Examples /// -/// You can create a `String` from [a literal string][str] with [`String::from`]: +/// You can create a `String` from [a literal string][`str`] with [`String::from`]: /// /// [`String::from`]: From::from /// @@ -268,7 +268,8 @@ use crate::vec::Vec; /// /// Here, there's no need to allocate more memory inside the loop. /// -/// [`&str`]: str +/// [`str`]: type@str +/// [`&str`]: type@str /// [`Deref`]: core::ops::Deref /// [`as_str()`]: String::as_str #[derive(PartialOrd, Eq, Ord)] |