Skip to content

Commit

Permalink
Auto merge of #30293 - steveklabnik:fixes, r=brson
Browse files Browse the repository at this point in the history
I meant to double check the work in #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.
  • Loading branch information
bors committed Dec 10, 2015
2 parents ee597a8 + 3061f9f commit 8eee0ef
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
7 changes: 4 additions & 3 deletions src/librustc_unicode/char.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
///
Expand Down
2 changes: 1 addition & 1 deletion src/libstd/primitive_docs.rs
Original file line number Diff line number Diff line change
Expand Up @@ -350,7 +350,7 @@ mod prim_slice { }
/// ```
///
/// [`.as_ptr()`]: #method.as_ptr
/// [`len()`]: # method.len
/// [`len()`]: #method.len
mod prim_str { }

#[doc(primitive = "tuple")]
Expand Down

0 comments on commit 8eee0ef

Please sign in to comment.