diff --git a/src/compiletest/procsrv.rs b/src/compiletest/procsrv.rs index a48a9f1be75..8fa34dd6d27 100644 --- a/src/compiletest/procsrv.rs +++ b/src/compiletest/procsrv.rs @@ -11,7 +11,7 @@ use std::os; use std::str; use std::io::process::{ProcessExit, Command, Process, ProcessOutput}; -use std::unstable::dynamic_lib::DynamicLibrary; +use std::dynamic_lib::DynamicLibrary; fn target_env(lib_path: &str, prog: &str) -> Vec<(String, String)> { let prog = if cfg!(windows) {prog.slice_to(prog.len() - 4)} else {prog}; diff --git a/src/librustc/metadata/filesearch.rs b/src/librustc/metadata/filesearch.rs index 9033b83d474..ec46e7f8592 100644 --- a/src/librustc/metadata/filesearch.rs +++ b/src/librustc/metadata/filesearch.rs @@ -13,7 +13,7 @@ use std::cell::RefCell; use std::os; use std::io::fs; -use std::unstable::dynamic_lib::DynamicLibrary; +use std::dynamic_lib::DynamicLibrary; use std::collections::HashSet; use myfs = util::fs; diff --git a/src/librustc/plugin/load.rs b/src/librustc/plugin/load.rs index ba50a15a82b..97ffcf279ae 100644 --- a/src/librustc/plugin/load.rs +++ b/src/librustc/plugin/load.rs @@ -16,7 +16,7 @@ use plugin::registry::Registry; use std::mem; use std::os; -use std::unstable::dynamic_lib::DynamicLibrary; +use std::dynamic_lib::DynamicLibrary; use syntax::ast; use syntax::attr; use syntax::visit; diff --git a/src/librustdoc/plugins.rs b/src/librustdoc/plugins.rs index 7a796e97f41..fee1d63a274 100644 --- a/src/librustdoc/plugins.rs +++ b/src/librustdoc/plugins.rs @@ -10,7 +10,7 @@ use clean; -use dl = std::unstable::dynamic_lib; +use dl = std::dynamic_lib; use serialize::json; use std::string::String; diff --git a/src/librustdoc/test.rs b/src/librustdoc/test.rs index 34363058297..0d777641274 100644 --- a/src/librustdoc/test.rs +++ b/src/librustdoc/test.rs @@ -15,7 +15,7 @@ use std::io::{Command, TempDir}; use std::os; use std::str; use std::string::String; -use std::unstable::dynamic_lib::DynamicLibrary; +use std::dynamic_lib::DynamicLibrary; use std::collections::{HashSet, HashMap}; use testing; diff --git a/src/libstd/unstable/dynamic_lib.rs b/src/libstd/dynamic_lib.rs similarity index 99% rename from src/libstd/unstable/dynamic_lib.rs rename to 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 or the MIT license -// , at your -// option. This file may not be copied, modified, or distributed -// except according to those terms. - -#![doc(hidden)] - -pub mod dynamic_lib; diff --git a/src/test/auxiliary/linkage-visibility.rs b/src/test/auxiliary/linkage-visibility.rs index 4ae0b6f14f5..0b4bea49fa2 100644 --- a/src/test/auxiliary/linkage-visibility.rs +++ b/src/test/auxiliary/linkage-visibility.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use std::unstable::dynamic_lib::DynamicLibrary; +use std::dynamic_lib::DynamicLibrary; #[no_mangle] pub fn foo() { bar(); } diff --git a/src/test/run-make/extern-fn-reachable/main.rs b/src/test/run-make/extern-fn-reachable/main.rs index e05d43145d7..0f759efb025 100644 --- a/src/test/run-make/extern-fn-reachable/main.rs +++ b/src/test/run-make/extern-fn-reachable/main.rs @@ -8,7 +8,7 @@ // option. This file may not be copied, modified, or distributed // except according to those terms. -use std::unstable::dynamic_lib::DynamicLibrary; +use std::dynamic_lib::DynamicLibrary; use std::os; pub fn main() { diff --git a/src/test/run-pass/linkage-visibility.rs b/src/test/run-pass/linkage-visibility.rs index e263767990a..58f66314e44 100644 --- a/src/test/run-pass/linkage-visibility.rs +++ b/src/test/run-pass/linkage-visibility.rs @@ -10,7 +10,7 @@ // aux-build:linkage-visibility.rs // ignore-android: FIXME(#10379) -// ignore-win32: std::unstable::dynamic_lib does not work on win32 well +// ignore-win32: std::dynamic_lib does not work on win32 well extern crate foo = "linkage-visibility";