---

yaml
---
r: 42749
b: refs/heads/try
c: 20af4d7
h: refs/heads/master
i:
  42747: 2b77f50
v: v3

Author: pnkfelix

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: 19dfec2aaf746535de1521f68421f9980dbf25de
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 2f46b763da2c098913884f101b6d71d69af41b49
-refs/heads/try: 8ec36d779b760eed8625ec69a983461e2ffe3914
+refs/heads/try: 20af4d73616a0abebb1a26aa4cc26f1c240e66e5
 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 = ~{f: 4};  // Error reported here.
+    x = ~X {f: 4};  // Error reported here.
     *y
 }
 ~~~
@@ -366,12 +366,14 @@ 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 ...) -> int {
+fn example5a(x: @S, callback: @fn()) -> 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,11 +2211,15 @@ 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; }
-# impl int: Shape { fn area(&self) -> float { 0.0 } }
-# impl int: Circle { fn radius(&self) -> float { 0.0 } }
-# let mycircle = 0;
+# 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) } }
 
-let mycircle: Circle = @mycircle as @Circle;
+let concrete = @CircleStruct{center:Point{x:3f,y:4f},radius:5f};
+let mycircle: Circle = concrete as @Circle;
 let nonsense = mycircle.radius() * mycircle.area();
 ~~~
 

branches/try/src/rt/rust_crate_map.cpp

@@ -9,7 +9,6 @@
 // except according to those terms.
 
 #include "rust_crate_map.h"
-#include <set>
 
 void iter_module_map(const mod_entry* map,
                      void (*fn)(const mod_entry* entry, void *cookie),
@@ -21,27 +20,18 @@ void iter_module_map(const mod_entry* map,
 
 void iter_crate_map(const cratemap* map,
                     void (*fn)(const mod_entry* map, void *cookie),
-                    void *cookie,
-                    std::set<const cratemap*>& visited) {
-    if (visited.find(map) == visited.end()) {
-        // Mark this crate visited
-        visited.insert(map);
-        // First iterate this crate
-        iter_module_map(map->entries(), fn, cookie);
-        // Then recurse on linked crates
-        for (cratemap::iterator i = map->begin(),
-                e = map->end(); i != e; ++i) {
-            iter_crate_map(*i, fn, cookie, visited);
-        }
+                    void *cookie) {
+    // First iterate this crate
+    iter_module_map(map->entries(), fn, cookie);
+    // Then recurse on linked crates
+    // FIXME (#2673) this does double work in diamond-shaped deps. could
+    //   keep a set of visited addresses, if it turns out to be actually
+    //   slow
+    for (cratemap::iterator i = map->begin(), e = map->end(); i != e; ++i) {
+        iter_crate_map(*i, fn, cookie);
     }
 }
 
-void iter_crate_map(const cratemap* map,
-                    void (*fn)(const mod_entry* map, void *cookie),
-                    void *cookie) {
-    std::set<const cratemap*> visited;
-    iter_crate_map(map, fn, cookie, visited);
-}
 //
 // Local Variables:
 // mode: C++