Skip to content

Commit d1f2737

Browse files
committed
std: Move unstable::finally to std::finally. #1457
[breaking-change]
1 parent 473a545 commit d1f2737

File tree

7 files changed

+6
-7
lines changed

7 files changed

+6
-7
lines changed

src/libstd/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ pub use core::clone;
145145
#[cfg(not(test))] pub use core::cmp;
146146
pub use core::container;
147147
pub use core::default;
148+
pub use core::finally;
148149
pub use core::intrinsics;
149150
pub use core::iter;
150151
#[cfg(not(test))] pub use core::kinds;

src/libstd/rt/args.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ mod imp {
144144
mod tests {
145145
use prelude::*;
146146
use super::*;
147-
use unstable::finally::Finally;
147+
use finally::Finally;
148148

149149
#[test]
150150
fn smoke_test() {

src/libstd/rt/task.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ use rt::unwind::Unwinder;
3636
use str::SendStr;
3737
use sync::atomics::{AtomicUint, SeqCst};
3838
use task::{TaskResult, TaskOpts};
39-
use unstable::finally::Finally;
39+
use finally::Finally;
4040

4141
/// The Task struct represents all state associated with a rust
4242
/// task. There are at this point two primary "subtypes" of task,

src/libstd/slice.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ use option::{None, Option, Some};
110110
use ptr::RawPtr;
111111
use ptr;
112112
use rt::heap::{allocate, deallocate};
113-
use unstable::finally::try_finally;
113+
use finally::try_finally;
114114
use vec::Vec;
115115

116116
pub use core::slice::{ref_slice, mut_ref_slice, Splits, Windows};

src/libstd/unstable/mod.rs

-2
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@
1010

1111
#![doc(hidden)]
1212

13-
pub use core::finally;
14-
1513
pub mod dynamic_lib;
1614

1715
pub mod sync;

src/libsync/raw.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
use std::kinds::marker;
1919
use std::mem;
2020
use std::sync::atomics;
21-
use std::unstable::finally::Finally;
21+
use std::finally::Finally;
2222

2323
use mutex;
2424

src/test/run-pass/backtrace.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ extern crate native;
1515

1616
use std::os;
1717
use std::io::process::Command;
18-
use std::unstable::finally::Finally;
18+
use std::finally::Finally;
1919
use std::str;
2020

2121
#[start]

0 commit comments

Comments
 (0)