From b4ecbe93401a56181baaffc4ff7e275aeecc5182 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Mon, 21 Apr 2014 22:28:21 -0700 Subject: std: Change Finally to take `&mut self` As with the previous commits, the Finally trait is primarily implemented for closures, so the trait was modified from `&self` to `&mut self`. This will require that any closure variable invoked with `finally` to be stored in a mutable slot. [breaking-change] --- src/libstd/rt/task.rs | 2 +- src/libstd/unstable/finally.rs | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src/libstd') diff --git a/src/libstd/rt/task.rs b/src/libstd/rt/task.rs index f75b5315207..2dab0e975da 100644 --- a/src/libstd/rt/task.rs +++ b/src/libstd/rt/task.rs @@ -109,7 +109,7 @@ impl Task { /// This function is *not* meant to be abused as a "try/catch" block. This /// is meant to be used at the absolute boundaries of a task's lifetime, and /// only for that purpose. - pub fn run(~self, f: ||) -> ~Task { + pub fn run(~self, mut f: ||) -> ~Task { // Need to put ourselves into TLS, but also need access to the unwinder. // Unsafely get a handle to the task so we can continue to use it after // putting it in tls (so we can invoke the unwinder). diff --git a/src/libstd/unstable/finally.rs b/src/libstd/unstable/finally.rs index c98ef880c10..96e52a4818e 100644 --- a/src/libstd/unstable/finally.rs +++ b/src/libstd/unstable/finally.rs @@ -35,19 +35,19 @@ use ops::Drop; #[cfg(test)] use task::failing; pub trait Finally { - fn finally(&self, dtor: ||) -> T; + fn finally(&mut self, dtor: ||) -> T; } impl<'a,T> Finally for ||: 'a -> T { - fn finally(&self, dtor: ||) -> T { - try_finally(&mut (), (), - |_, _| (*self)(), + fn finally(&mut self, dtor: ||) -> T { + try_finally(&mut (), self, + |_, f| (*f)(), |_| dtor()) } } impl Finally for fn() -> T { - fn finally(&self, dtor: ||) -> T { + fn finally(&mut self, dtor: ||) -> T { try_finally(&mut (), (), |_, _| (*self)(), |_| dtor()) -- cgit 1.4.1-3-g733a5