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

[breaking-change]

diff --git a/src/libcore/finally.rs b/src/libcore/finally.rs
index a4d261f539a5005a8761a049a22b628a059ed5b0..9f7592a80bd180621d923635455c0e5226281517 100644 (file)
--- a/src/libcore/finally.rs
+++ b/src/libcore/finally.rs
@@ -20,7 +20,7 @@
 # Example
 
 ```
-use std::unstable::finally::Finally;
+use std::finally::Finally;
 
 (|| {
     // ...
@@ -75,7 +75,7 @@ fn finally(&mut self, dtor: ||) -> 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 bb6f93cf087fb0b67efe7be2fd59125406fc62e1..ca70fd162b7d8f7d3fb417075cd66dc56f2bdd61 100644 (file)
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -144,6 +144,7 @@
 #[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 cde20521c2f66bda09b1486bfa368ffa9f338da1..4316fb21d415047ecbef2d5a04107dbb4061718f 100644 (file)
--- a/src/libstd/rt/args.rs
+++ b/src/libstd/rt/args.rs
@@ -144,7 +144,7 @@ unsafe fn load_argc_and_argv(argc: int, argv: **u8) -> Vec<Vec<u8>> {
     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 749f44d1c9d2c0e37837a0d64527c86b0426f8bc..3e61f3ff23624050614b0570ab0ec863b9aad0e0 100644 (file)
--- a/src/libstd/rt/task.rs
+++ b/src/libstd/rt/task.rs
@@ -36,7 +36,7 @@
 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 18dc871fb27102ead4937f74a9a2bc5d327acd08..e1242e24537572d4d4c183d2d8bb2212ce4ab25a 100644 (file)
--- a/src/libstd/slice.rs
+++ b/src/libstd/slice.rs
@@ -110,7 +110,7 @@
 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 2e27f4d4488c579e8602bd82c2a7654cdc801487..d8de6463fabbd73c7feb9da30b987f5daec9b4c2 100644 (file)
--- 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 591318d24b23c45c7af18de9131c0d8293521166..aae790f887a61caf4f1a595f0ae4cf740ec026a5 100644 (file)
--- 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 5e7b9d9560e381794df09e73205090b79d22cee2..7f2c9e14af10d747728660012a1b616c79548566 100644 (file)
--- a/src/test/run-pass/backtrace.rs
+++ b/src/test/run-pass/backtrace.rs
@@ -15,7 +15,7 @@
 
 use std::os;
 use std::io::process::Command;
-use std::unstable::finally::Finally;
+use std::finally::Finally;
 use std::str;
 
 #[start]