diff options
| author | Brian Anderson <banderson@mozilla.com> | 2014-06-08 20:12:10 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-06-09 17:46:53 -0700 |
| commit | 1635ef2a1958749e7b0cf4e812e1a87cd919027f (patch) | |
| tree | 15af3b75a8ac11af34f6df1bd46fdba6560a9377 /src/libstd | |
| parent | 5eb4d19dc35dc59aaeaf3d53759c9b0341148ef8 (diff) | |
| download | rust-1635ef2a1958749e7b0cf4e812e1a87cd919027f.tar.gz rust-1635ef2a1958749e7b0cf4e812e1a87cd919027f.zip | |
std: Move dynamic_lib from std::unstable to std
This leaves a deprecated reexport in place temporarily. Closes #1457.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/dynamic_lib.rs (renamed from src/libstd/unstable/dynamic_lib.rs) | 3 | ||||
| -rw-r--r-- | src/libstd/lib.rs | 13 | ||||
| -rw-r--r-- | src/libstd/rt/backtrace.rs | 2 | ||||
| -rw-r--r-- | src/libstd/unstable/mod.rs | 13 |
4 files changed, 13 insertions, 18 deletions
diff --git a/src/libstd/unstable/dynamic_lib.rs b/src/libstd/dynamic_lib.rs index 6980c5cc0c2..fa6efc8a4b1 100644 --- a/src/libstd/unstable/dynamic_lib.rs +++ b/src/libstd/dynamic_lib.rs @@ -16,6 +16,9 @@ A simple wrapper over the platform's dynamic library facilities */ +#![experimental] +#![allow(missing_doc)] + use clone::Clone; use c_str::ToCStr; use iter::Iterator; diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 85813c02d55..e147997334c 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -241,15 +241,12 @@ pub mod sync; /* Runtime and platform support */ pub mod c_vec; +pub mod dynamic_lib; pub mod os; pub mod io; pub mod path; pub mod fmt; -// Private APIs -#[unstable] -pub mod unstable; - // FIXME #7809: This shouldn't be pub, and it should be reexported under 'unstable' // but name resolution doesn't work without it being pub. #[unstable] @@ -279,3 +276,11 @@ mod std { // The test runner requires std::slice::Vector, so re-export std::slice just for it. #[cfg(test)] pub use slice; } + +#[deprecated] +#[allow(missing_doc)] +#[doc(hiden)] +pub mod unstable { + #[deprecated = "use std::dynamic_lib"] + pub use dynamic_lib; +} diff --git a/src/libstd/rt/backtrace.rs b/src/libstd/rt/backtrace.rs index 83fc95267af..423f372f018 100644 --- a/src/libstd/rt/backtrace.rs +++ b/src/libstd/rt/backtrace.rs @@ -614,7 +614,7 @@ mod imp { use rt::mutex::{StaticNativeMutex, NATIVE_MUTEX_INIT}; use slice::ImmutableVector; use str::StrSlice; - use unstable::dynamic_lib::DynamicLibrary; + use dynamic_lib::DynamicLibrary; #[allow(non_snake_case_functions)] extern "system" { diff --git a/src/libstd/unstable/mod.rs b/src/libstd/unstable/mod.rs deleted file mode 100644 index 985ef2e142c..00000000000 --- a/src/libstd/unstable/mod.rs +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright 2012-2013 The Rust Project Developers. See the COPYRIGHT -// file at the top-level directory of this distribution and at -// http://rust-lang.org/COPYRIGHT. -// -// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or -// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license -// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - -#![doc(hidden)] - -pub mod dynamic_lib; |
