diff options
| author | bors <bors@rust-lang.org> | 2020-07-19 14:17:08 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-07-19 14:17:08 +0000 |
| commit | d7f94516345a36ddfcd68cbdf1df835d356795c3 (patch) | |
| tree | bea3e4ab40d0c1eaf79c02d717cf8f5be4d3366f /src/libcore | |
| parent | 48036804d2bc461b243c5d291b850e44bcca68ef (diff) | |
| parent | 1636961a0e02adb7a1200d98a3c94f68decd3a13 (diff) | |
Auto merge of #74518 - Manishearth:rollup-jfmnh1r, r=Manishearth
Rollup of 4 pull requests Successful merges: - #74333 (Deny unsafe operations in unsafe functions in libstd/alloc.rs) - #74356 (Remove combine function) - #74419 (Add a thumbv4t-none-eabi target) - #74485 (More intra-doc links, add explicit exception list to linkchecker) Failed merges: - #74486 (Improve Read::read_exact documentation) r? @ghost
Diffstat (limited to 'src/libcore')
| -rw-r--r-- | src/libcore/str/mod.rs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/libcore/str/mod.rs b/src/libcore/str/mod.rs index faf58cafbb7..790ec4bd24f 100644 --- a/src/libcore/str/mod.rs +++ b/src/libcore/str/mod.rs @@ -4,7 +4,7 @@ //! //! For more details, see the [`std::str`] module. //! -//! [`std::str`]: ../../std/str/index.html +//! [`std::str`]: self #![stable(feature = "rust1", since = "1.0.0")] @@ -163,13 +163,11 @@ Section: Creating a string /// Errors which can occur when attempting to interpret a sequence of [`u8`] /// as a string. /// -/// [`u8`]: ../../std/primitive.u8.html -/// /// As such, the `from_utf8` family of functions and methods for both [`String`]s /// and [`&str`]s make use of this error, for example. /// /// [`String`]: ../../std/string/struct.String.html#method.from_utf8 -/// [`&str`]: ../../std/str/fn.from_utf8.html +/// [`&str`]: from_utf8 /// /// # Examples /// |