Skip to content

Commit

Permalink
Rollup merge of #25021 - frewsxcv:an-utf, r=steveklabnik
Browse files Browse the repository at this point in the history
Even spelled out, one would say 'a Universal Character Set'
  • Loading branch information
Manishearth committed May 1, 2015
2 parents ac7a75e + 554da45 commit 616b94b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/librustc_unicode/u_str.rs
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,7 @@ pub struct Utf16Encoder<I> {
}

impl<I> Utf16Encoder<I> {
/// Create an UTF-16 encoder from any `char` iterator.
/// Create a UTF-16 encoder from any `char` iterator.
pub fn new(chars: I) -> Utf16Encoder<I> where I: Iterator<Item=char> {
Utf16Encoder { chars: chars, extra: 0 }
}
Expand Down
2 changes: 1 addition & 1 deletion src/libstd/io/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ pub trait Read {

/// Transforms this `Read` instance to an `Iterator` over `char`s.
///
/// This adaptor will attempt to interpret this reader as an UTF-8 encoded
/// This adaptor will attempt to interpret this reader as a UTF-8 encoded
/// sequence of characters. The returned iterator will return `None` once
/// EOF is reached for this reader. Otherwise each element yielded will be a
/// `Result<char, E>` where `E` may contain information about what I/O error
Expand Down
8 changes: 4 additions & 4 deletions src/libstd/sys/common/wtf8.rs
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ impl Wtf8Buf {
Wtf8Buf { bytes: Vec::with_capacity(n) }
}

/// Creates a WTF-8 string from an UTF-8 `String`.
/// Creates a WTF-8 string from a UTF-8 `String`.
///
/// This takes ownership of the `String` and does not copy.
///
Expand All @@ -171,7 +171,7 @@ impl Wtf8Buf {
Wtf8Buf { bytes: string.into_bytes() }
}

/// Creates a WTF-8 string from an UTF-8 `&str` slice.
/// Creates a WTF-8 string from a UTF-8 `&str` slice.
///
/// This copies the content of the slice.
///
Expand Down Expand Up @@ -245,7 +245,7 @@ impl Wtf8Buf {
self.bytes.capacity()
}

/// Append an UTF-8 slice at the end of the string.
/// Append a UTF-8 slice at the end of the string.
#[inline]
pub fn push_str(&mut self, other: &str) {
self.bytes.push_all(other.as_bytes())
Expand Down Expand Up @@ -527,7 +527,7 @@ impl Wtf8 {
}

/// Lossily converts the string to UTF-8.
/// Returns an UTF-8 `&str` slice if the contents are well-formed in UTF-8.
/// Returns a UTF-8 `&str` slice if the contents are well-formed in UTF-8.
///
/// Surrogates are replaced with `"\u{FFFD}"` (the replacement character “�”).
///
Expand Down

0 comments on commit 616b94b

Please sign in to comment.