diff options
| author | Aaron Turon <aturon@mozilla.com> | 2014-11-02 17:04:32 -0800 |
|---|---|---|
| committer | Aaron Turon <aturon@mozilla.com> | 2014-11-06 08:03:18 -0800 |
| commit | cfafc1b7377d34d8c60db7cd386836d39b80af41 (patch) | |
| tree | fc5490eb766f91db85f6fa6061a48efd23f0457e /src/libunicode/tables.rs | |
| parent | e84e7a00ddec76570bbaa9afea385d544f616814 (diff) | |
| download | rust-cfafc1b7377d34d8c60db7cd386836d39b80af41.tar.gz rust-cfafc1b7377d34d8c60db7cd386836d39b80af41.zip | |
Prelude: rename and consolidate extension traits
This commit renames a number of extension traits for slices and string slices, now that they have been refactored for DST. In many cases, multiple extension traits could now be consolidated. Further consolidation will be possible with generalized where clauses. The renamings are consistent with the [new `-Prelude` suffix](https://github.com/rust-lang/rfcs/pull/344). There are probably a few more candidates for being renamed this way, but that is left for API stabilization of the relevant modules. Because this renames traits, it is a: [breaking-change] However, I do not expect any code that currently uses the standard library to actually break. Closes #17917
Diffstat (limited to 'src/libunicode/tables.rs')
| -rw-r--r-- | src/libunicode/tables.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libunicode/tables.rs b/src/libunicode/tables.rs index 87ee3220ee5..212502fd181 100644 --- a/src/libunicode/tables.rs +++ b/src/libunicode/tables.rs @@ -13,12 +13,12 @@ #![allow(missing_doc, non_uppercase_statics, non_snake_case)] /// The version of [Unicode](http://www.unicode.org/) -/// that the `UnicodeChar` and `UnicodeStrSlice` traits are based on. +/// that the `UnicodeChar` and `UnicodeStrPrelude` traits are based on. pub const UNICODE_VERSION: (uint, uint, uint) = (7, 0, 0); fn bsearch_range_table(c: char, r: &'static [(char,char)]) -> bool { use core::cmp::{Equal, Less, Greater}; - use core::slice::ImmutableSlice; + use core::slice::SlicePrelude; r.binary_search(|&(lo,hi)| { if lo <= c && c <= hi { Equal } else if hi < c { Less } @@ -6242,7 +6242,7 @@ pub mod normalization { fn bsearch_range_value_table(c: char, r: &'static [(char, char, u8)]) -> u8 { use core::cmp::{Equal, Less, Greater}; - use core::slice::ImmutableSlice; + use core::slice::SlicePrelude; use core::slice; match r.binary_search(|&(lo, hi, _)| { if lo <= c && c <= hi { Equal } @@ -6367,7 +6367,7 @@ pub mod normalization { pub mod conversions { use core::cmp::{Equal, Less, Greater}; - use core::slice::ImmutableSlice; + use core::slice::SlicePrelude; use core::tuple::Tuple2; use core::option::{Option, Some, None}; use core::slice; @@ -6935,7 +6935,7 @@ pub mod conversions { pub mod charwidth { use core::option::{Option, Some, None}; - use core::slice::ImmutableSlice; + use core::slice::SlicePrelude; use core::slice; fn bsearch_range_value_table(c: char, is_cjk: bool, r: &'static [(char, char, u8, u8)]) -> u8 { @@ -7134,7 +7134,7 @@ pub mod charwidth { } pub mod grapheme { - use core::slice::ImmutableSlice; + use core::slice::SlicePrelude; use core::slice; #[allow(non_camel_case_types)] |
