about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-12-10 06:38:06 +0000
committerbors <bors@rust-lang.org>2015-12-10 06:38:06 +0000
commit8eee0efd1f3f43e379abf7dfcb190bd60700eeca (patch)
tree9870ad66098b6439a3d1a4d606a850b2fe78721b
parentee597a8ee155e1a9d9a6479cde35e8c6975a543e (diff)
parent3061f9f5734107c859f987d504c191a724215e8e (diff)
Auto merge of #30293 - steveklabnik:fixes, r=brson
I meant to double check the work in https://github.com/rust-lang/rust/issues/29429, but due to Mozlando, forgot. Here are two small fixes.

r? @brson I would like to get this backported to beta as well, sorry :( I don't generally want doc backports, but feel this is exceptional and worth it.
-rw-r--r--src/librustc_unicode/char.rs7
-rw-r--r--src/libstd/primitive_docs.rs2
2 files changed, 5 insertions, 4 deletions
diff --git a/src/librustc_unicode/char.rs b/src/librustc_unicode/char.rs
index 3824dd0e436..455e2feee4c 100644
--- a/src/librustc_unicode/char.rs
+++ b/src/librustc_unicode/char.rs
@@ -386,9 +386,10 @@ impl char {
     /// Returns the number of 16-bit code units this `char` would need if
     /// encoded in UTF-16.
     ///
-    /// See the documentation for [`len_utf8()`][len_utf8] for more explanation
-    /// of this concept. This function is a mirror, but for UTF-16 instead of
-    /// UTF-8.
+    /// See the documentation for [`len_utf8()`] for more explanation of this
+    /// concept. This function is a mirror, but for UTF-16 instead of UTF-8.
+    ///
+    /// [`len_utf8()`]: #method.len_utf8
     ///
     /// # Examples
     ///
diff --git a/src/libstd/primitive_docs.rs b/src/libstd/primitive_docs.rs
index fd422d3b397..afeb4231aba 100644
--- a/src/libstd/primitive_docs.rs
+++ b/src/libstd/primitive_docs.rs
@@ -350,7 +350,7 @@ mod prim_slice { }
 /// ```
 ///
 /// [`.as_ptr()`]: #method.as_ptr
-/// [`len()`]: # method.len
+/// [`len()`]: #method.len
 mod prim_str { }
 
 #[doc(primitive = "tuple")]