OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

auto merge of #14437 : Sawyer47/rust/utf16-items, r=alexcrichton

Browse Source 
According to Rust's style guide acronyms should be CamelCase.
This commit is contained in:
bors 2014-05-28 09:26:42 -07:00
commit cd6fb59ee2
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/libcore/str.rs
View File

@ -692,19 +692,19 @@ pub fn is_utf16(v: &[u16]) -> bool {
/// An iterator that decodes UTF-16 encoded codepoints from a vector /// An iterator that decodes UTF-16 encoded codepoints from a vector
/// of `u16`s. /// of `u16`s.
#[deriving(Clone)] #[deriving(Clone)]
pub struct UTF16Items<'a> { pub struct Utf16Items<'a> {
iter: slice::Items<'a, u16> iter: slice::Items<'a, u16>
} }
/// The possibilities for values decoded from a `u16` stream. /// The possibilities for values decoded from a `u16` stream.
#[deriving(Eq, TotalEq, Clone, Show)] #[deriving(Eq, TotalEq, Clone, Show)]
pub enum UTF16Item { pub enum Utf16Item {
/// A valid codepoint. /// A valid codepoint.
ScalarValue(char), ScalarValue(char),
/// An invalid surrogate without its pair. /// An invalid surrogate without its pair.
LoneSurrogate(u16) LoneSurrogate(u16)
} }
impl UTF16Item { impl Utf16Item {
/// Convert `self` to a `char`, taking `LoneSurrogate`s to the /// Convert `self` to a `char`, taking `LoneSurrogate`s to the
/// replacement character (U+FFFD). /// replacement character (U+FFFD).
#[inline] #[inline]
@ -716,8 +716,8 @@ impl UTF16Item {
} }
} }
impl<'a> Iterator<UTF16Item> for UTF16Items<'a> { impl<'a> Iterator<Utf16Item> for Utf16Items<'a> {
fn next(&mut self) -> Option<UTF16Item> { fn next(&mut self) -> Option<Utf16Item> {
let u = match self.iter.next() { let u = match self.iter.next() {
Some(u) => *u, Some(u) => *u,
None => return None None => return None
@ -781,8 +781,8 @@ impl<'a> Iterator<UTF16Item> for UTF16Items<'a> {
/// ScalarValue('i'), ScalarValue('c'), /// ScalarValue('i'), ScalarValue('c'),
/// LoneSurrogate(0xD834)]); /// LoneSurrogate(0xD834)]);
/// ``` /// ```
pub fn utf16_items<'a>(v: &'a [u16]) -> UTF16Items<'a> { pub fn utf16_items<'a>(v: &'a [u16]) -> Utf16Items<'a> {
UTF16Items { iter : v.iter() } Utf16Items { iter : v.iter() }
} }
/// Return a slice of `v` ending at (and not including) the first NUL /// Return a slice of `v` ending at (and not including) the first NUL

4
src/libstd/str.rs
View File

@ -86,8 +86,8 @@ use vec::Vec;
pub use core::str::{from_utf8, CharEq, Chars, CharOffsets}; pub use core::str::{from_utf8, CharEq, Chars, CharOffsets};
pub use core::str::{Bytes, CharSplits}; pub use core::str::{Bytes, CharSplits};
pub use core::str::{CharSplitsN, Words, AnyLines, MatchIndices, StrSplits}; pub use core::str::{CharSplitsN, Words, AnyLines, MatchIndices, StrSplits};
pub use core::str::{eq_slice, is_utf8, is_utf16, UTF16Items}; pub use core::str::{eq_slice, is_utf8, is_utf16, Utf16Items};
pub use core::str::{UTF16Item, ScalarValue, LoneSurrogate, utf16_items}; pub use core::str::{Utf16Item, ScalarValue, LoneSurrogate, utf16_items};
pub use core::str::{truncate_utf16_at_nul, utf8_char_width, CharRange}; pub use core::str::{truncate_utf16_at_nul, utf8_char_width, CharRange};
pub use core::str::{Str, StrSlice}; pub use core::str::{Str, StrSlice};