about summary refs log tree commit diff
path: root/src/libstd_unicode
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-12-03 23:02:40 +0000
committerbors <bors@rust-lang.org>2017-12-03 23:02:40 +0000
commitfdfbcf85d55da97ed1a00823510b876018047aaf (patch)
tree01d830b5a1019b1db9936cb9084bdfb64164ea4f /src/libstd_unicode
parent1956d5535ad77ddf46e4b29ba089a8b4a73cfaea (diff)
parent48d38555e533649c5cc1634d64a1851d265da979 (diff)
downloadrust-fdfbcf85d55da97ed1a00823510b876018047aaf.tar.gz
rust-fdfbcf85d55da97ed1a00823510b876018047aaf.zip
Auto merge of #46482 - frewsxcv:rollup, r=frewsxcv
Rollup of 8 pull requests

- Successful merges: #45957, #46260, #46432, #46442, #46454, #46462, #46465, #46473
- Failed merges:
Diffstat (limited to 'src/libstd_unicode')
-rw-r--r--src/libstd_unicode/char.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd_unicode/char.rs b/src/libstd_unicode/char.rs
index 6b573e5011b..1c0cdfd8435 100644
--- a/src/libstd_unicode/char.rs
+++ b/src/libstd_unicode/char.rs
@@ -1461,7 +1461,7 @@ pub struct DecodeUtf16<I>
     buf: Option<u16>,
 }
 
-/// An iterator that decodes UTF-16 encoded code points from an iterator of `u16`s.
+/// An error that can be returned when decoding UTF-16 code points.
 #[stable(feature = "decode_utf16", since = "1.9.0")]
 #[derive(Debug, Clone, Eq, PartialEq)]
 pub struct DecodeUtf16Error {