Skip to content

Commit 33801b4

Browse files
committed
---
yaml --- r: 112510 b: refs/heads/snap-stage3 c: b4ecbe9 h: refs/heads/master v: v3
1 parent 3fb5712 commit 33801b4

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 30e373390f1a2f74e78bf9ca9c8ca68451f3511a
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 2b2d1e14c97b7692debf62dd2739049f1f377a5e
4+
refs/heads/snap-stage3: b4ecbe93401a56181baaffc4ff7e275aeecc5182
55
refs/heads/try: fa3000fae833e0869b11da51cabb2a2598ba86d1
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libstd/rt/task.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ impl Task {
109109
/// This function is *not* meant to be abused as a "try/catch" block. This
110110
/// is meant to be used at the absolute boundaries of a task's lifetime, and
111111
/// only for that purpose.
112-
pub fn run(~self, f: ||) -> ~Task {
112+
pub fn run(~self, mut f: ||) -> ~Task {
113113
// Need to put ourselves into TLS, but also need access to the unwinder.
114114
// Unsafely get a handle to the task so we can continue to use it after
115115
// putting it in tls (so we can invoke the unwinder).

branches/snap-stage3/src/libstd/unstable/finally.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,19 +35,19 @@ use ops::Drop;
3535
#[cfg(test)] use task::failing;
3636

3737
pub trait Finally<T> {
38-
fn finally(&self, dtor: ||) -> T;
38+
fn finally(&mut self, dtor: ||) -> T;
3939
}
4040

4141
impl<'a,T> Finally<T> for ||: 'a -> T {
42-
fn finally(&self, dtor: ||) -> T {
43-
try_finally(&mut (), (),
44-
|_, _| (*self)(),
42+
fn finally(&mut self, dtor: ||) -> T {
43+
try_finally(&mut (), self,
44+
|_, f| (*f)(),
4545
|_| dtor())
4646
}
4747
}
4848

4949
impl<T> Finally<T> for fn() -> T {
50-
fn finally(&self, dtor: ||) -> T {
50+
fn finally(&mut self, dtor: ||) -> T {
5151
try_finally(&mut (), (),
5252
|_, _| (*self)(),
5353
|_| dtor())

0 commit comments

Comments
 (0)