about summary refs log tree commit diff
path: root/src/liballoc/string.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-11-21 17:14:05 +0000
committerbors <bors@rust-lang.org>2017-11-21 17:14:05 +0000
commit63739ab7b210c1a8c890c2ea5238a3284877daa3 (patch)
tree3a6ffba1817907b557e03e8663d4bae6a27c413f /src/liballoc/string.rs
parentf28df200260c89b2a0bdf942510e0f888c29a70d (diff)
parent7c8b36f6f151707833e75463068f0630dd0a0644 (diff)
downloadrust-63739ab7b210c1a8c890c2ea5238a3284877daa3.tar.gz
rust-63739ab7b210c1a8c890c2ea5238a3284877daa3.zip
Auto merge of #46166 - kennytm:rollup, r=kennytm
Rollup of 11 pull requests

- Successful merges: #45987, #46031, #46050, #46052, #46103, #46120, #46134, #46141, #46148, #46155, #46157
- Failed merges:
Diffstat (limited to 'src/liballoc/string.rs')
-rw-r--r--src/liballoc/string.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/liballoc/string.rs b/src/liballoc/string.rs
index 25fcc1ccdab..cd0f4a22e9c 100644
--- a/src/liballoc/string.rs
+++ b/src/liballoc/string.rs
@@ -596,7 +596,7 @@ impl String {
     /// Decode a UTF-16 encoded vector `v` into a `String`, returning [`Err`]
     /// if `v` contains any invalid data.
     ///
-    /// [`Err`]: ../../std/result/enum.Result.htlm#variant.Err
+    /// [`Err`]: ../../std/result/enum.Result.html#variant.Err
     ///
     /// # Examples
     ///