diff --git a/src/libgreen/context.rs b/src/libgreen/context.rs index 58188ede13cb..3f6dc299da51 100644 --- a/src/libgreen/context.rs +++ b/src/libgreen/context.rs @@ -13,7 +13,7 @@ use std::cast::{transmute, transmute_mut_unsafe, transmute_region, transmute_mut_region}; use stack::Stack; use std::unstable::stack; -use std::unstable::raw; +use std::raw; // FIXME #7761: Registers is boxed so that it is 16-byte aligned, for storing // SSE regs. It would be marginally better not to do this. In C++ we diff --git a/src/libgreen/sched.rs b/src/libgreen/sched.rs index a966dff000ae..f722744e23d7 100644 --- a/src/libgreen/sched.rs +++ b/src/libgreen/sched.rs @@ -16,7 +16,7 @@ use std::rt::task::BlockedTask; use std::rt::task::Task; use std::sync::deque; use std::unstable::mutex::NativeMutex; -use std::unstable::raw; +use std::raw; use TaskState; use context::Context; diff --git a/src/libgreen/task.rs b/src/libgreen/task.rs index e139cfa1025a..1d7fb64896f5 100644 --- a/src/libgreen/task.rs +++ b/src/libgreen/task.rs @@ -26,7 +26,7 @@ use std::rt::rtio; use std::rt::task::{Task, BlockedTask, SendMessage}; use std::task::TaskOpts; use std::unstable::mutex::NativeMutex; -use std::unstable::raw; +use std::raw; use context::Context; use coroutine::Coroutine; diff --git a/src/librustc/back/archive.rs b/src/librustc/back/archive.rs index d5d784cc2de3..6dec7550fec3 100644 --- a/src/librustc/back/archive.rs +++ b/src/librustc/back/archive.rs @@ -22,7 +22,7 @@ use std::libc; use std::os; use std::run::{ProcessOptions, Process, ProcessOutput}; use std::str; -use std::unstable::raw; +use std::raw; use extra::tempfile::TempDir; use syntax::abi; diff --git a/src/libstd/c_str.rs b/src/libstd/c_str.rs index e6b0958617e3..af5d9838186d 100644 --- a/src/libstd/c_str.rs +++ b/src/libstd/c_str.rs @@ -79,7 +79,7 @@ use str; use vec::{ImmutableVector, MutableVector}; use vec; use rt::global_heap::malloc_raw; -use unstable::raw::Slice; +use raw::Slice; /// The representation of a C String. /// diff --git a/src/libstd/cast.rs b/src/libstd/cast.rs index c2db0c782050..8280553c1a32 100644 --- a/src/libstd/cast.rs +++ b/src/libstd/cast.rs @@ -113,7 +113,7 @@ pub unsafe fn copy_lifetime_vec<'a,S,T>(_ptr: &'a [S], ptr: &T) -> &'a T { #[cfg(test)] mod tests { use cast::{bump_box_refcount, transmute}; - use unstable::raw; + use raw; #[test] fn test_transmute_copy() { diff --git a/src/libstd/cleanup.rs b/src/libstd/cleanup.rs index dd43d8e2971a..39c7932cdc8f 100644 --- a/src/libstd/cleanup.rs +++ b/src/libstd/cleanup.rs @@ -11,7 +11,7 @@ #[doc(hidden)]; use ptr; -use unstable::raw; +use raw; static RC_IMMORTAL : uint = 0x77777777; diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 469589744848..65b908a9f566 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -198,6 +198,8 @@ pub mod reflect; pub mod unstable; #[experimental] pub mod intrinsics; +#[experimental] +pub mod raw; /* For internal use, not exported */ diff --git a/src/libstd/managed.rs b/src/libstd/managed.rs index 63196cd4f162..4cd99492ee45 100644 --- a/src/libstd/managed.rs +++ b/src/libstd/managed.rs @@ -15,7 +15,7 @@ /// Returns the refcount of a shared box (as just before calling this) #[inline] pub fn refcount(t: @T) -> uint { - use unstable::raw::Repr; + use raw::Repr; unsafe { (*t.repr()).ref_count - 1 } } diff --git a/src/libstd/unstable/raw.rs b/src/libstd/raw.rs similarity index 99% rename from src/libstd/unstable/raw.rs rename to src/libstd/raw.rs index c25422d24e91..c7ba2ad39328 100644 --- a/src/libstd/unstable/raw.rs +++ b/src/libstd/raw.rs @@ -8,6 +8,8 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. +#[allow(missing_doc)]; + use cast; /// The representation of a Rust managed box diff --git a/src/libstd/reflect.rs b/src/libstd/reflect.rs index 5ee840748e67..a9e70bd3c631 100644 --- a/src/libstd/reflect.rs +++ b/src/libstd/reflect.rs @@ -18,7 +18,7 @@ Runtime type reflection use intrinsics::{Disr, Opaque, TyDesc, TyVisitor}; use mem; -use unstable::raw; +use raw; /** * Trait for visitor that wishes to reflect on data. To use this, create a diff --git a/src/libstd/repr.rs b/src/libstd/repr.rs index 8e1a07147485..c1b276899d5a 100644 --- a/src/libstd/repr.rs +++ b/src/libstd/repr.rs @@ -30,7 +30,7 @@ use str::StrSlice; use to_str::ToStr; use vec::OwnedVector; use intrinsics::{Disr, Opaque, TyDesc, TyVisitor, get_tydesc, visit_tydesc}; -use unstable::raw; +use raw; macro_rules! try( ($me:expr, $e:expr) => ( match $e { diff --git a/src/libstd/rt/global_heap.rs b/src/libstd/rt/global_heap.rs index 191d57a58fc6..23b23cf8af02 100644 --- a/src/libstd/rt/global_heap.rs +++ b/src/libstd/rt/global_heap.rs @@ -11,7 +11,7 @@ use libc::{c_void, size_t, free, malloc, realloc}; use ptr::{RawPtr, mut_null}; use intrinsics::abort; -use unstable::raw; +use raw; use mem::size_of; #[inline] diff --git a/src/libstd/rt/local_heap.rs b/src/libstd/rt/local_heap.rs index 8a42cd735654..4ff25a34210e 100644 --- a/src/libstd/rt/local_heap.rs +++ b/src/libstd/rt/local_heap.rs @@ -20,7 +20,7 @@ use ptr::RawPtr; use rt::global_heap; use rt::local::Local; use rt::task::Task; -use unstable::raw; +use raw; use vec::ImmutableVector; use vec_ng::Vec; diff --git a/src/libstd/rt/unwind.rs b/src/libstd/rt/unwind.rs index 127859b42756..16d677b5ff25 100644 --- a/src/libstd/rt/unwind.rs +++ b/src/libstd/rt/unwind.rs @@ -177,7 +177,7 @@ impl Unwinder { } pub fn try(&mut self, f: ||) { - use unstable::raw::Closure; + use raw::Closure; use libc::{c_void}; unsafe { diff --git a/src/libstd/str.rs b/src/libstd/str.rs index 1c1b10bb14cc..4d5eabbed104 100644 --- a/src/libstd/str.rs +++ b/src/libstd/str.rs @@ -104,7 +104,7 @@ use vec::{OwnedVector, OwnedCloneableVector, ImmutableVector, MutableVector}; use vec_ng::Vec; use default::Default; use to_bytes::{IterBytes, Cb}; -use unstable::raw::Repr; +use raw::Repr; /* Section: Creating a string @@ -1386,7 +1386,7 @@ pub mod raw { use str::{is_utf8, OwnedStr, StrSlice}; use vec; use vec::{MutableVector, ImmutableVector, OwnedVector}; - use unstable::raw::Slice; + use raw::Slice; /// Create a Rust string from a *u8 buffer of the given length pub unsafe fn from_buf_len(buf: *u8, len: uint) -> ~str { diff --git a/src/libstd/unstable/mod.rs b/src/libstd/unstable/mod.rs index d3dae938b34d..9f37bfcddb94 100644 --- a/src/libstd/unstable/mod.rs +++ b/src/libstd/unstable/mod.rs @@ -21,7 +21,6 @@ pub mod simd; pub mod lang; pub mod sync; pub mod mutex; -pub mod raw; pub mod stack; /** diff --git a/src/libstd/vec.rs b/src/libstd/vec.rs index 0adc6083f6b8..00617af05b19 100644 --- a/src/libstd/vec.rs +++ b/src/libstd/vec.rs @@ -122,7 +122,7 @@ use mem::size_of; use kinds::marker; use uint; use unstable::finally::try_finally; -use unstable::raw::{Repr, Slice, Vec}; +use raw::{Repr, Slice, Vec}; /** * Creates and initializes an owned vector. @@ -2488,7 +2488,7 @@ pub mod raw { use ptr; use ptr::RawPtr; use vec::{with_capacity, MutableVector, OwnedVector}; - use unstable::raw::Slice; + use raw::Slice; /** * Form a slice from a pointer and length (as a number of units, diff --git a/src/libstd/vec_ng.rs b/src/libstd/vec_ng.rs index 114f34963e2c..3532e7b26a40 100644 --- a/src/libstd/vec_ng.rs +++ b/src/libstd/vec_ng.rs @@ -24,7 +24,7 @@ use option::{None, Option, Some}; use ptr::RawPtr; use ptr; use rt::global_heap::{malloc_raw, realloc_raw}; -use unstable::raw::Slice; +use raw::Slice; use vec::{ImmutableVector, Items, MutItems, MutableVector, RevItems}; pub struct Vec {