Rename UTF16Item[s] to Utf16Item[s]
According to Rust's style guide acronyms should be CamelCase. [breaking-change]
This commit is contained in:
parent
7e049fefc7
commit
8c5a8e10b2
|
@ -692,19 +692,19 @@ pub fn is_utf16(v: &[u16]) -> bool {
|
|||
/// An iterator that decodes UTF-16 encoded codepoints from a vector
|
||||
/// of `u16`s.
|
||||
#[deriving(Clone)]
|
||||
pub struct UTF16Items<'a> {
|
||||
pub struct Utf16Items<'a> {
|
||||
iter: slice::Items<'a, u16>
|
||||
}
|
||||
/// The possibilities for values decoded from a `u16` stream.
|
||||
#[deriving(Eq, TotalEq, Clone, Show)]
|
||||
pub enum UTF16Item {
|
||||
pub enum Utf16Item {
|
||||
/// A valid codepoint.
|
||||
ScalarValue(char),
|
||||
/// An invalid surrogate without its pair.
|
||||
LoneSurrogate(u16)
|
||||
}
|
||||
|
||||
impl UTF16Item {
|
||||
impl Utf16Item {
|
||||
/// Convert `self` to a `char`, taking `LoneSurrogate`s to the
|
||||
/// replacement character (U+FFFD).
|
||||
#[inline]
|
||||
|
@ -716,8 +716,8 @@ impl UTF16Item {
|
|||
}
|
||||
}
|
||||
|
||||
impl<'a> Iterator<UTF16Item> for UTF16Items<'a> {
|
||||
fn next(&mut self) -> Option<UTF16Item> {
|
||||
impl<'a> Iterator<Utf16Item> for Utf16Items<'a> {
|
||||
fn next(&mut self) -> Option<Utf16Item> {
|
||||
let u = match self.iter.next() {
|
||||
Some(u) => *u,
|
||||
None => return None
|
||||
|
@ -781,8 +781,8 @@ impl<'a> Iterator<UTF16Item> for UTF16Items<'a> {
|
|||
/// ScalarValue('i'), ScalarValue('c'),
|
||||
/// LoneSurrogate(0xD834)]);
|
||||
/// ```
|
||||
pub fn utf16_items<'a>(v: &'a [u16]) -> UTF16Items<'a> {
|
||||
UTF16Items { iter : v.iter() }
|
||||
pub fn utf16_items<'a>(v: &'a [u16]) -> Utf16Items<'a> {
|
||||
Utf16Items { iter : v.iter() }
|
||||
}
|
||||
|
||||
/// Return a slice of `v` ending at (and not including) the first NUL
|
||||
|
|
|
@ -86,8 +86,8 @@ use vec::Vec;
|
|||
pub use core::str::{from_utf8, CharEq, Chars, CharOffsets};
|
||||
pub use core::str::{Bytes, CharSplits};
|
||||
pub use core::str::{CharSplitsN, Words, AnyLines, MatchIndices, StrSplits};
|
||||
pub use core::str::{eq_slice, is_utf8, is_utf16, UTF16Items};
|
||||
pub use core::str::{UTF16Item, ScalarValue, LoneSurrogate, utf16_items};
|
||||
pub use core::str::{eq_slice, is_utf8, is_utf16, Utf16Items};
|
||||
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::{Str, StrSlice};
|
||||
|
||||
|
|
Loading…
Reference in New Issue