---

yaml
---
r: 21238
b: refs/heads/snap-stage3
c: 8ee79c7
h: refs/heads/master
v: v3

Author: nikomatsakis

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: e430a699f2c60890d9b86069fd0c68a70ece7120
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 3b09c3deaa9a376d0ae40a783713ece3720ca08f
+refs/heads/snap-stage3: 8ee79c79aada1b5943b5ada11570f9b903c74579
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libcore/dvec.rs

@@ -90,7 +90,7 @@ priv impl<A> DVec<A> {
     }
 
     #[inline(always)]
-    fn borrow<B>(f: fn(-~[mut A]) -> B) -> B {
+    fn check_out<B>(f: fn(-~[mut A]) -> B) -> B {
         unsafe {
             let mut data = unsafe::reinterpret_cast(null::<()>());
             data <-> self.data;
@@ -124,13 +124,13 @@ impl<A> DVec<A> {
      */
     #[inline(always)]
     fn swap(f: fn(-~[mut A]) -> ~[mut A]) {
-        self.borrow(|v| self.give_back(f(v)))
+        self.check_out(|v| self.give_back(f(v)))
     }
 
     /// Returns the number of elements currently in the dvec
     pure fn len() -> uint {
         unchecked {
-            do self.borrow |v| {
+            do self.check_out |v| {
                 let l = v.len();
                 self.give_back(v);
                 l
@@ -146,7 +146,7 @@ impl<A> DVec<A> {
 
     /// Remove and return the last element
     fn pop() -> A {
-        do self.borrow |v| {
+        do self.check_out |v| {
             let mut v <- v;
             let result = vec::pop(v);
             self.give_back(v);
@@ -176,18 +176,37 @@ impl<A> DVec<A> {
 
     /// Remove and return the first element
     fn shift() -> A {
-        do self.borrow |v| {
+        do self.check_out |v| {
             let mut v = vec::from_mut(v);
             let result = vec::shift(v);
             self.give_back(vec::to_mut(v));
             result
         }
     }
 
-    // Reverse the elements in the list, in place
+    /// Reverse the elements in the list, in place
     fn reverse() {
-        do self.borrow |v| {
+        do self.check_out |v| {
             vec::reverse(v);
+            self.give_back(v);
+        }
+    }
+
+    /// Gives access to the vector as a slice with immutable contents
+    fn borrow<R>(op: fn(x: &[A]) -> R) -> R {
+        do self.check_out |v| {
+            let result = op(v);
+            self.give_back(v);
+            result
+        }
+    }
+
+    /// Gives access to the vector as a slice with mutable contents
+    fn borrow_mut<R>(op: fn(x: &[mut A]) -> R) -> R {
+        do self.check_out |v| {
+            let result = op(v);
+            self.give_back(v);
+            result
         }
     }
 }
@@ -249,7 +268,7 @@ impl<A: copy> DVec<A> {
      */
     pure fn get() -> ~[A] {
         unchecked {
-            do self.borrow |v| {
+            do self.check_out |v| {
                 let w = vec::from_mut(copy v);
                 self.give_back(v);
                 w

branches/snap-stage3/src/libcore/task.rs

@@ -1187,7 +1187,9 @@ fn spawn_raw(+opts: TaskOpts, +f: fn~()) {
                 };
             if result {
                 // Unwinding function in case any ancestral enlisting fails
-                let bail = |tg| { leave_taskgroup(tg, child, false) };
+                let bail = |tg: TaskGroupInner| {
+                    leave_taskgroup(tg, child, false)
+                };
                 // Attempt to join every ancestor group.
                 result =
                     for each_ancestor(ancestors, some(bail)) |ancestor_tg| {

branches/snap-stage3/src/libstd/cell.rs

@@ -41,10 +41,11 @@ impl<T> Cell<T> {
     }
 
     // Calls a closure with a reference to the value.
-    fn with_ref(f: fn(v: &T)) {
-        let val = move self.take();
-        f(&val);
-        self.put_back(move val);
+    fn with_ref<R>(op: fn(v: &T) -> R) -> R {
+        let v = self.take();
+        let r = op(&v);
+        self.put_back(v);
+        return move r;
     }
 }