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/libstd/rt | |
| 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/libstd/rt')
| -rw-r--r-- | src/libstd/rt/backtrace.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libstd/rt/backtrace.rs b/src/libstd/rt/backtrace.rs index 5d7aa0509c5..b08b92b8587 100644 --- a/src/libstd/rt/backtrace.rs +++ b/src/libstd/rt/backtrace.rs @@ -18,7 +18,7 @@ use iter::Iterator; use option::{Some, None}; use os; use result::{Ok, Err}; -use str::StrSlice; +use str::StrPrelude; use sync::atomic; use unicode::char::UnicodeChar; @@ -255,7 +255,7 @@ mod imp { pub fn write(w: &mut Writer) -> IoResult<()> { use iter::{Iterator, range}; use result; - use slice::{MutableSlice}; + use slice::{SlicePrelude}; extern { fn backtrace(buf: *mut *mut libc::c_void, @@ -394,7 +394,7 @@ mod imp { use path::GenericPath; use ptr::RawPtr; use ptr; - use slice::{ImmutableSlice, MutableSlice}; + use slice::{SlicePrelude}; //////////////////////////////////////////////////////////////////////// // libbacktrace.h API @@ -666,8 +666,8 @@ mod imp { use path::Path; use result::{Ok, Err}; use rt::mutex::{StaticNativeMutex, NATIVE_MUTEX_INIT}; - use slice::ImmutableSlice; - use str::StrSlice; + use slice::SlicePrelude; + use str::StrPrelude; use dynamic_lib::DynamicLibrary; #[allow(non_snake_case)] |
