---

yaml
---
r: 31686
b: refs/heads/dist-snap
c: 793c0a1
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -7,6 +7,6 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
-refs/heads/dist-snap: 6a7c714df665ea943da79f96071dd4a1069ec93d
+refs/heads/dist-snap: 793c0a1116af40d8a84941525f148a3d785c3f0c
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/dist-snap/src/test/auxiliary/issue_2242_a.rs

@@ -2,9 +2,9 @@
 #[crate_type = "lib"];
 
 trait to_str {
-    fn to_str() -> str;
+    fn to_str() -> ~str;
 }
 
-impl of to_str for str {
-    fn to_str() -> str { self }
+impl of to_str for ~str {
+    fn to_str() -> ~str { self }
 }

branches/dist-snap/src/test/auxiliary/issue_2242_b.rs

@@ -5,5 +5,5 @@ use a;
 import a::to_str;
 
 impl of to_str for int {
-    fn to_str() -> str { fmt!{"%?", self} }
+    fn to_str() -> ~str { fmt!{"%?", self} }
 }

branches/dist-snap/src/test/auxiliary/issue_2242_c.rs

@@ -6,5 +6,5 @@ use a;
 import a::to_str;
 
 impl of to_str for bool {
-    fn to_str() -> str { fmt!{"%b", self} }
+    fn to_str() -> ~str { fmt!{"%b", self} }
 }

branches/dist-snap/src/test/run-pass/issue-2242-d.rs

@@ -1,4 +1,3 @@
-// xfail-test
 // aux-build:issue_2242_a.rs
 // aux-build:issue_2242_b.rs
 // aux-build:issue_2242_c.rs
@@ -7,11 +6,10 @@ use a;
 use b;
 use c;
 
-import b::to_str;
-import c::to_str;
+import a::to_str;
 
 fn main() {
-    io::println("foo".to_str());
+    io::println((~"foo").to_str());
     io::println(1.to_str());
     io::println(true.to_str());
 }