From 793c0a1116af40d8a84941525f148a3d785c3f0c Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Mon, 6 Aug 2012 21:40:49 -0700
Subject: [PATCH] test: Modernize and un-XFAIL issue-2242-d.rs (issue #2242)

---
 src/test/auxiliary/issue_2242_a.rs | 6 +++---
 src/test/auxiliary/issue_2242_b.rs | 2 +-
 src/test/auxiliary/issue_2242_c.rs | 2 +-
 src/test/run-pass/issue-2242-d.rs  | 6 ++----
 4 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/test/auxiliary/issue_2242_a.rs b/src/test/auxiliary/issue_2242_a.rs
index 54ae3cba785c..36a7daae9dcb 100644
--- a/src/test/auxiliary/issue_2242_a.rs
+++ b/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 }
 }
diff --git a/src/test/auxiliary/issue_2242_b.rs b/src/test/auxiliary/issue_2242_b.rs
index 9b91918846c1..51a955c85903 100644
--- a/src/test/auxiliary/issue_2242_b.rs
+++ b/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} }
 }
diff --git a/src/test/auxiliary/issue_2242_c.rs b/src/test/auxiliary/issue_2242_c.rs
index 7dfcd9e33b00..3a6fc87173be 100644
--- a/src/test/auxiliary/issue_2242_c.rs
+++ b/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} }
 }
diff --git a/src/test/run-pass/issue-2242-d.rs b/src/test/run-pass/issue-2242-d.rs
index c6f2cc99e33c..b1a8badf00b7 100644
--- a/src/test/run-pass/issue-2242-d.rs
+++ b/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());
 }