---

yaml
---
r: 42750
b: refs/heads/try
c: 810eeef
h: refs/heads/master
v: v3

Author: alexcrichton

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 19dfec2aaf746535de1521f68421f9980dbf25de
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
-refs/heads/try: 20af4d73616a0abebb1a26aa4cc26f1c240e66e5
+refs/heads/try: 810eeef444d0f0b56d6fdc44dbfa10e7f155bd0a
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278

branches/try/doc/tutorial-borrowed-ptr.md

@@ -302,7 +302,7 @@ rejected by the compiler):
 fn example3() -> int {
     let mut x = ~X {f: 3};
     let y = &x.f;
-    x = ~X {f: 4};  // Error reported here.
+    x = ~{f: 4};  // Error reported here.
     *y
 }
 ~~~
@@ -366,14 +366,12 @@ Things get trickier when the unique box is not uniquely owned by the
 stack frame, or when there is no way for the compiler to determine the
 box's owner. Consider a program like this:
 
-~~~ {.xfail-test}
+~~~
 struct R { g: int }
 struct S { mut f: ~R }
-fn example5a(x: @S, callback: @fn()) -> int {
+fn example5a(x: @S ...) -> int {
     let y = &x.f.g;   // Error reported here.
     ...
-    callback();
-    ...
 #   return 0;
 }
 ~~~

branches/try/doc/tutorial.md

@@ -2015,7 +2015,7 @@ the method name with the trait name.
 The compiler will use type inference to decide which implementation to call.
 
 ~~~~
-trait Shape { static fn new(area: float) -> self; }
+# trait Shape { static fn new(area: float) -> self; }
 # use float::consts::pi;
 # use float::sqrt;
 struct Circle { radius: float }
@@ -2211,15 +2211,11 @@ Likewise, supertrait methods may also be called on trait objects.
 ~~~ {.xfail-test}
 # trait Shape { fn area(&self) -> float; }
 # trait Circle : Shape { fn radius(&self) -> float; }
-# use float::consts::pi;
-# use float::sqrt;
-# struct Point { x: float, y: float }
-# struct CircleStruct { center: Point, radius: float }
-# impl CircleStruct: Circle { fn radius(&self) -> float { sqrt(self.area() / pi) } }
-# impl CircleStruct: Shape { fn area(&self) -> float { pi * square(self.radius) } }
+# impl int: Shape { fn area(&self) -> float { 0.0 } }
+# impl int: Circle { fn radius(&self) -> float { 0.0 } }
+# let mycircle = 0;
 
-let concrete = @CircleStruct{center:Point{x:3f,y:4f},radius:5f};
-let mycircle: Circle = concrete as @Circle;
+let mycircle: Circle = @mycircle as @Circle;
 let nonsense = mycircle.radius() * mycircle.area();
 ~~~
 

branches/try/src/libcore/hashmap.rs

@@ -220,14 +220,17 @@ pub mod linear {
                 },
             };
 
+            /* re-inserting buckets may cause changes in size, so remember what
+               our new size is ahead of time before we start insertions */
+            let size = self.size - 1;
             idx = self.next_bucket(idx, len_buckets);
             while self.buckets[idx].is_some() {
                 let mut bucket = None;
                 bucket <-> self.buckets[idx];
                 self.insert_opt_bucket(bucket);
                 idx = self.next_bucket(idx, len_buckets);
             }
-            self.size -= 1;
+            self.size = size;
 
             value
         }