---

yaml
---
r: 62747
b: refs/heads/snap-stage3
c: c9c4d92
h: refs/heads/master
i:
  62745: 1d11303
  62743: 149fcac
v: v3

Author: lkuper

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 77de84b4f629b63c784903ed7cc08c024b10496b
+refs/heads/snap-stage3: c9c4d92889ed1b147368a31127c0aa2e4db76cd5
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libextra/deque.rs

@@ -125,31 +125,6 @@ pub impl<T> Deque<T> {
         self.hi = (self.hi + 1u) % self.elts.len();
         self.nelts += 1u;
     }
-
-    /// Reserve capacity for exactly `n` elements in the given deque,
-    /// doing nothing if `self`'s capacity is already equal to or greater
-    /// than the requested capacity
-    ///
-    /// # Arguments
-    ///
-    /// * n - The number of elements to reserve space for
-    fn reserve(&mut self, n: uint) {
-        vec::reserve(&mut self.elts, n);
-    }
-
-    /// Reserve capacity for at least `n` elements in the given deque,
-    /// over-allocating in case the caller needs to reserve additional
-    /// space.
-    ///
-    /// Do nothing if `self`'s capacity is already equal to or greater
-    /// than the requested capacity.
-    ///
-    /// # Arguments
-    ///
-    /// * n - The number of elements to reserve space for
-    fn reserve_at_least(&mut self, n: uint) {
-        vec::reserve_at_least(&mut self.elts, n);
-    }
 }
 
 /// Grow is only called on full elts, so nelts is also len(elts), unlike
@@ -174,7 +149,6 @@ mod tests {
     use super::*;
     use core::cmp::Eq;
     use core::kinds::Copy;
-    use core::vec::capacity;
 
     #[test]
     fn test_simple() {
@@ -354,29 +328,4 @@ mod tests {
         }
 
     }
-
-    #[test]
-    fn test_reserve() {
-        let mut d = Deque::new();
-        d.add_back(0u64);
-        d.reserve(50);
-        assert_eq!(capacity(&mut d.elts), 50);
-        let mut d = Deque::new();
-        d.add_back(0u32);
-        d.reserve(50);
-        assert_eq!(capacity(&mut d.elts), 50);
-    }
-
-    #[test]
-    fn test_reserve_at_least() {
-        let mut d = Deque::new();
-        d.add_back(0u64);
-        d.reserve_at_least(50);
-        assert_eq!(capacity(&mut d.elts), 64);
-        let mut d = Deque::new();
-        d.add_back(0u32);
-        d.reserve_at_least(50);
-        assert_eq!(capacity(&mut d.elts), 64);
-    }
-
 }

branches/snap-stage3/src/test/compile-fail/issue-6762.rs

@@ -0,0 +1,24 @@
+//xfail-test
+
+// Creating a stack closure which references an owned pointer and then
+// transferring ownership of the owned box before invoking the stack
+// closure results in a crash.
+
+fn twice(x: ~uint) -> uint
+{
+     *x * 2
+}
+
+fn invoke(f : &fn() -> uint)
+{
+     f();
+}
+
+fn main()
+{
+      let x  : ~uint         = ~9;
+      let sq : &fn() -> uint = || { *x * *x };
+
+      twice(x);
+      invoke(sq);
+}