Skip to content

Commit

Permalink
std: Move unstable::finally to std::finally. rust-lang#1457
Browse files Browse the repository at this point in the history
[breaking-change]
  • Loading branch information
brson committed May 23, 2014
1 parent 473a545 commit d1f2737
Show file tree
Hide file tree
Showing 7 changed files with 6 additions and 7 deletions.
1 change: 1 addition & 0 deletions src/libstd/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/libstd/rt/args.rs
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ mod imp {
mod tests {
use prelude::*;
use super::*;
use unstable::finally::Finally;
use finally::Finally;

#[test]
fn smoke_test() {
Expand Down
2 changes: 1 addition & 1 deletion src/libstd/rt/task.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion src/libstd/slice.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down
2 changes: 0 additions & 2 deletions src/libstd/unstable/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@

#![doc(hidden)]

pub use core::finally;

pub mod dynamic_lib;

pub mod sync;
Expand Down
2 changes: 1 addition & 1 deletion src/libsync/raw.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion src/test/run-pass/backtrace.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down

1 comment on commit d1f2737

@brson
Copy link
Owner Author

@brson brson commented on d1f2737 May 23, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r=alexcrichton

Please sign in to comment.