Skip to content

Commit 4fe785e

Browse files
committed
---
yaml --- r: 114669 b: refs/heads/auto c: 85a8e6b h: refs/heads/master i: 114667: 9428ccd v: v3
1 parent 01bce3d commit 4fe785e

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
@@ -13,7 +13,7 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
1313
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1414
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1515
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
16-
refs/heads/auto: 71924525458e508be139d76f48b34e64a5a9dca3
16+
refs/heads/auto: 85a8e6b80ae91eb00a0bce96a5cec8017e1b37da
1717
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1818
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1919
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/libstd/unstable/finally.rs renamed to branches/auto/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/auto/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/auto/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)