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.
This commit is contained in:
bors 2015-12-10 06:38:06 +00:00
commit 8eee0efd1f
2 changed files with 5 additions and 4 deletions

View file

@ -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
///

View file

@ -350,7 +350,7 @@ mod prim_slice { }
/// ```
///
/// [`.as_ptr()`]: #method.as_ptr
/// [`len()`]: # method.len
/// [`len()`]: #method.len
mod prim_str { }
#[doc(primitive = "tuple")]