about summary refs log tree commit diff
path: root/src/liballoc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-04-14 14:14:47 +0000
committerbors <bors@rust-lang.org>2020-04-14 14:14:47 +0000
commit6805906fba0bca2bc77da9ad09cc9f91c3cea3eb (patch)
tree387ee6e30eec34b94999b8b49bd2770a5313c07c /src/liballoc
parentba72b15666b2491415aec703a02c2364fe5e2790 (diff)
parent816443e6cfbd07443ec9c26f9b83fdd9ffa5715c (diff)
downloadrust-6805906fba0bca2bc77da9ad09cc9f91c3cea3eb.tar.gz
rust-6805906fba0bca2bc77da9ad09cc9f91c3cea3eb.zip
Auto merge of #71125 - Dylan-DPC:rollup-3b8prjh, r=Dylan-DPC
Rollup of 5 pull requests

Successful merges:

 - #71112 (Remove the last remnant of unsigned Neg)
 - #71120 (Clean up E0517 explanation)
 - #71121 (Fix broken link in documentation for String::from_utf8)
 - #71122 (update `FnCtxt::lookup_method` docs)
 - #71124 (Add missing comma)

Failed merges:

r? @ghost
Diffstat (limited to 'src/liballoc')
-rw-r--r--src/liballoc/string.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/liballoc/string.rs b/src/liballoc/string.rs
index 86e09b7be2d..80fa8139915 100644
--- a/src/liballoc/string.rs
+++ b/src/liballoc/string.rs
@@ -482,6 +482,7 @@ impl String {
     /// [`String`]: struct.String.html
     /// [`u8`]: ../../std/primitive.u8.html
     /// [`Vec<u8>`]: ../../std/vec/struct.Vec.html
+    /// [`&str`]: ../../std/primitive.str.html
     /// [`str::from_utf8`]: ../../std/str/fn.from_utf8.html
     /// [`into_bytes`]: struct.String.html#method.into_bytes
     /// [`FromUtf8Error`]: struct.FromUtf8Error.html