From d1f27379b2652fc72179d3413d2dbf02e1ffeaeb Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Tue, 20 May 2014 22:27:24 -0700
Subject: [PATCH] std: Move unstable::finally to std::finally. #1457

[breaking-change]
---
 src/libstd/lib.rs              | 1 +
 src/libstd/rt/args.rs          | 2 +-
 src/libstd/rt/task.rs          | 2 +-
 src/libstd/slice.rs            | 2 +-
 src/libstd/unstable/mod.rs     | 2 --
 src/libsync/raw.rs             | 2 +-
 src/test/run-pass/backtrace.rs | 2 +-
 7 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index 750e62a853f07..02b4f6aae7a2f 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -145,6 +145,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 cde20521c2f66..4316fb21d4150 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 749f44d1c9d2c..3e61f3ff23624 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 ae1caa16d28ad..fd07c69278abe 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 2e27f4d4488c5..d8de6463fabbd 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 591318d24b23c..aae790f887a61 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 5e7b9d9560e38..7f2c9e14af10d 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]