diff options
| author | Brian Anderson <banderson@mozilla.com> | 2014-02-15 23:49:08 -0800 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2014-02-23 01:07:53 -0800 |
| commit | 4d10bdc5b9fecee38abcad78a86e552a961b1a0a (patch) | |
| tree | 652d89a93931598a38fed6aa082b87acab38317e /src/libstd/rt | |
| parent | edf351e9f7d17777b1385093bfa7b6654e662d44 (diff) | |
| download | rust-4d10bdc5b9fecee38abcad78a86e552a961b1a0a.tar.gz rust-4d10bdc5b9fecee38abcad78a86e552a961b1a0a.zip | |
std: Move intrinsics to std::intrinsics.
Issue #1457
Diffstat (limited to 'src/libstd/rt')
| -rw-r--r-- | src/libstd/rt/global_heap.rs | 2 | ||||
| -rw-r--r-- | src/libstd/rt/unwind.rs | 2 | ||||
| -rw-r--r-- | src/libstd/rt/util.rs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/rt/global_heap.rs b/src/libstd/rt/global_heap.rs index 8128bb02148..191d57a58fc 100644 --- a/src/libstd/rt/global_heap.rs +++ b/src/libstd/rt/global_heap.rs @@ -10,7 +10,7 @@ use libc::{c_void, size_t, free, malloc, realloc}; use ptr::{RawPtr, mut_null}; -use unstable::intrinsics::abort; +use intrinsics::abort; use unstable::raw; use mem::size_of; diff --git a/src/libstd/rt/unwind.rs b/src/libstd/rt/unwind.rs index ef8bd94c897..127859b4275 100644 --- a/src/libstd/rt/unwind.rs +++ b/src/libstd/rt/unwind.rs @@ -69,7 +69,7 @@ use rt::local::Local; use rt::task::Task; use str::Str; use task::TaskResult; -use unstable::intrinsics; +use intrinsics; use uw = self::libunwind; diff --git a/src/libstd/rt/util.rs b/src/libstd/rt/util.rs index 69e240f30bc..408f51f2017 100644 --- a/src/libstd/rt/util.rs +++ b/src/libstd/rt/util.rs @@ -143,7 +143,7 @@ memory and partly incapable of presentation to others.", abort(); fn abort() -> ! { - use std::unstable::intrinsics; + use intrinsics; unsafe { intrinsics::abort() } } } |
