diff options
| author | Brian Anderson <banderson@mozilla.com> | 2014-08-06 18:58:43 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2014-08-13 11:30:14 -0700 |
| commit | 4f5b6927e8e428239082ecc17b85a0506bcc9a65 (patch) | |
| tree | 321222a7ebea4299f89dbd029e14dbec06d03ec8 /src/libunicode | |
| parent | d9177707926d4fbed9dd9e4e7afc9a8c185dafe0 (diff) | |
| download | rust-4f5b6927e8e428239082ecc17b85a0506bcc9a65.tar.gz rust-4f5b6927e8e428239082ecc17b85a0506bcc9a65.zip | |
std: Rename various slice traits for consistency
ImmutableVector -> ImmutableSlice ImmutableEqVector -> ImmutableEqSlice ImmutableOrdVector -> ImmutableOrdSlice MutableVector -> MutableSlice MutableVectorAllocating -> MutableSliceAllocating MutableCloneableVector -> MutableCloneableSlice MutableOrdVector -> MutableOrdSlice These are all in the prelude so most code will not break. [breaking-change]
Diffstat (limited to 'src/libunicode')
| -rw-r--r-- | src/libunicode/normalize.rs | 2 | ||||
| -rw-r--r-- | src/libunicode/tables.rs | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/libunicode/normalize.rs b/src/libunicode/normalize.rs index ec31181e8a7..c5e1773dcff 100644 --- a/src/libunicode/normalize.rs +++ b/src/libunicode/normalize.rs @@ -15,7 +15,7 @@ use core::cmp::{Equal, Less, Greater}; use core::option::{Option, Some, None}; -use core::slice::ImmutableVector; +use core::slice::ImmutableSlice; use tables::normalization::{canonical_table, compatibility_table, composition_table}; fn bsearch_table<T>(c: char, r: &'static [(char, &'static [T])]) -> Option<&'static [T]> { diff --git a/src/libunicode/tables.rs b/src/libunicode/tables.rs index 4332fc596c9..e58fe589557 100644 --- a/src/libunicode/tables.rs +++ b/src/libunicode/tables.rs @@ -14,7 +14,7 @@ fn bsearch_range_table(c: char, r: &'static [(char,char)]) -> bool { use core::cmp::{Equal, Less, Greater}; - use core::slice::ImmutableVector; + use core::slice::ImmutableSlice; use core::option::None; r.bsearch(|&(lo,hi)| { if lo <= c && c <= hi { Equal } @@ -6230,7 +6230,7 @@ pub mod normalization { fn bsearch_range_value_table(c: char, r: &'static [(char, char, u8)]) -> u8 { use core::option::{Some, None}; use core::cmp::{Equal, Less, Greater}; - use core::slice::ImmutableVector; + use core::slice::ImmutableSlice; match r.bsearch(|&(lo, hi, _)| { if lo <= c && c <= hi { Equal } else if hi < c { Less } @@ -6354,7 +6354,7 @@ pub mod normalization { pub mod conversions { use core::cmp::{Equal, Less, Greater}; - use core::slice::ImmutableVector; + use core::slice::ImmutableSlice; use core::tuple::Tuple2; use core::option::{Option, Some, None}; @@ -6915,7 +6915,7 @@ pub mod conversions { pub mod charwidth { use core::option::{Option, Some, None}; - use core::slice::ImmutableVector; + use core::slice::ImmutableSlice; fn bsearch_range_value_table(c: char, is_cjk: bool, r: &'static [(char, char, u8, u8)]) -> u8 { use core::cmp::{Equal, Less, Greater}; @@ -7113,7 +7113,7 @@ pub mod charwidth { pub mod grapheme { use core::option::{Some, None}; - use core::slice::ImmutableVector; + use core::slice::ImmutableSlice; #[allow(non_camel_case_types)] #[deriving(Clone)] |
