Skip to content

Commit ff21051

Browse files
committed
---
yaml --- r: 151385 b: refs/heads/try2 c: 85a8e6b h: refs/heads/master i: 151383: 0c10b17 v: v3
1 parent 4df4109 commit ff21051

File tree

4 files changed

+10
-2
lines changed

4 files changed

+10
-2
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: 71924525458e508be139d76f48b34e64a5a9dca3
8+
refs/heads/try2: 85a8e6b80ae91eb00a0bce96a5cec8017e1b37da
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libstd/unstable/finally.rs renamed to branches/try2/src/libcore/finally.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,17 @@ use std::unstable::finally::Finally;
3030
```
3131
*/
3232

33+
#![experimental]
34+
3335
use ops::Drop;
3436

3537
#[cfg(test)] use task::failing;
3638

39+
/// A trait for executing a destructor unconditionally after a block of code,
40+
/// regardless of whether the blocked fails.
3741
pub trait Finally<T> {
42+
/// Executes this object, unconditionally running `dtor` after this block of
43+
/// code has run.
3844
fn finally(&mut self, dtor: ||) -> T;
3945
}
4046

branches/try2/src/libcore/lib.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,5 @@ pub mod container;
3737

3838
/* Core types and methods on primitives */
3939

40+
pub mod finally;
4041
pub mod char;

branches/try2/src/libstd/unstable/mod.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@
1313
use prelude::*;
1414
use libc::uintptr_t;
1515

16+
pub use core::finally;
17+
1618
pub mod dynamic_lib;
1719

18-
pub mod finally;
1920
pub mod simd;
2021
pub mod sync;
2122
pub mod mutex;

0 commit comments

Comments
 (0)