std: Move unstable::finally to std::finally. #1457

[breaking-change]

8 files changed, 8 insertions, 9 deletions

diff --git a/src/libcore/finally.rs b/src/libcore/finally.rs
index a4d261f539a..9f7592a80bd 100644
--- a/src/libcore/finally.rs
+++ b/src/libcore/finally.rs
@@ -20,7 +20,7 @@ also be used. See that function for more details.
 # Example
 
 ```
-use std::unstable::finally::Finally;
+use std::finally::Finally;
 
 (|| {
     // ...
@@ -75,7 +75,7 @@ impl<T> Finally<T> for fn() -> T {
  * # Example
  *
  * ```
- * use std::unstable::finally::try_finally;
+ * use std::finally::try_finally;
  *
  * struct State<'a> { buffer: &'a mut [u8], len: uint }
  * # let mut buf = [];
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index bb6f93cf087..ca70fd162b7 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -144,6 +144,7 @@ pub use core::clone;
 #[cfg(not(test))] pub use core::cmp;
 pub use core::container;
 pub use core::default;
+pub use core::finally;
 pub use core::intrinsics;
 pub use core::iter;
 #[cfg(not(test))] pub use core::kinds;
diff --git a/src/libstd/rt/args.rs b/src/libstd/rt/args.rs
index cde20521c2f..4316fb21d41 100644
--- a/src/libstd/rt/args.rs
+++ b/src/libstd/rt/args.rs
@@ -144,7 +144,7 @@ mod imp {
     mod tests {
         use prelude::*;
         use super::*;
-        use unstable::finally::Finally;
+        use finally::Finally;
 
         #[test]
         fn smoke_test() {
diff --git a/src/libstd/rt/task.rs b/src/libstd/rt/task.rs
index 749f44d1c9d..3e61f3ff236 100644
--- a/src/libstd/rt/task.rs
+++ b/src/libstd/rt/task.rs
@@ -36,7 +36,7 @@ use rt::unwind::Unwinder;
 use str::SendStr;
 use sync::atomics::{AtomicUint, SeqCst};
 use task::{TaskResult, TaskOpts};
-use unstable::finally::Finally;
+use finally::Finally;
 
 /// The Task struct represents all state associated with a rust
 /// task. There are at this point two primary "subtypes" of task,
diff --git a/src/libstd/slice.rs b/src/libstd/slice.rs
index 18dc871fb27..e1242e24537 100644
--- a/src/libstd/slice.rs
+++ b/src/libstd/slice.rs
@@ -110,7 +110,7 @@ use option::{None, Option, Some};
 use ptr::RawPtr;
 use ptr;
 use rt::heap::{allocate, deallocate};
-use unstable::finally::try_finally;
+use finally::try_finally;
 use vec::Vec;
 
 pub use core::slice::{ref_slice, mut_ref_slice, Splits, Windows};
diff --git a/src/libstd/unstable/mod.rs b/src/libstd/unstable/mod.rs
index 2e27f4d4488..d8de6463fab 100644
--- a/src/libstd/unstable/mod.rs
+++ b/src/libstd/unstable/mod.rs
@@ -10,8 +10,6 @@
 
 #![doc(hidden)]
 
-pub use core::finally;
-
 pub mod dynamic_lib;
 
 pub mod sync;
diff --git a/src/libsync/raw.rs b/src/libsync/raw.rs
index 591318d24b2..aae790f887a 100644
--- a/src/libsync/raw.rs
+++ b/src/libsync/raw.rs
@@ -18,7 +18,7 @@
 use std::kinds::marker;
 use std::mem;
 use std::sync::atomics;
-use std::unstable::finally::Finally;
+use std::finally::Finally;
 
 use mutex;
 
diff --git a/src/test/run-pass/backtrace.rs b/src/test/run-pass/backtrace.rs
index 5e7b9d9560e..7f2c9e14af1 100644
--- a/src/test/run-pass/backtrace.rs
+++ b/src/test/run-pass/backtrace.rs
@@ -15,7 +15,7 @@ extern crate native;
 
 use std::os;
 use std::io::process::Command;
-use std::unstable::finally::Finally;
+use std::finally::Finally;
 use std::str;
 
 #[start]