diff options
| author | bors <bors@rust-lang.org> | 2014-06-09 21:57:09 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-06-09 21:57:09 -0700 |
| commit | 5bc2d03955618664377e98352d784a7f145db24a (patch) | |
| tree | ab76e5ea82592a803694bf232e983734482ba088 /src/libstd/rt | |
| parent | 5bf5cc605fd2732fa35b284a4401bfaa899dcae2 (diff) | |
| parent | 5ede96c2fd62a63e75cb5faf073933d914f3eeaf (diff) | |
| download | rust-5bc2d03955618664377e98352d784a7f145db24a.tar.gz rust-5bc2d03955618664377e98352d784a7f145db24a.zip | |
auto merge of #14783 : alexcrichton/rust/rollup, r=alexcrichton
Closes #14611 (std: Remove the as_utf16_p functions) Closes #14694 (Num cleanup) Closes #14760 (Add --color to test binary options) Closes #14763 (std: Move dynamic_lib from std::unstable to std) Closes #14766 (Add test for issue #13446) Closes #14769 (collections: Add missing Default impls) Closes #14773 (General nits) Closes #14776 (rustdoc: Correctly classify enums/typedefs)
Diffstat (limited to 'src/libstd/rt')
| -rw-r--r-- | src/libstd/rt/backtrace.rs | 2 |
1 files changed, 1 insertions, 1 deletions
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" { |