Skip to content

Commit 5cbe509

Browse files
committed
---
yaml --- r: 23024 b: refs/heads/master c: 793c0a1 h: refs/heads/master v: v3
1 parent 5fabe1a commit 5cbe509

File tree

5 files changed

+8
-10
lines changed

5 files changed

+8
-10
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 6a7c714df665ea943da79f96071dd4a1069ec93d
2+
refs/heads/master: 793c0a1116af40d8a84941525f148a3d785c3f0c
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
55
refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/test/auxiliary/issue_2242_a.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
#[crate_type = "lib"];
33

44
trait to_str {
5-
fn to_str() -> str;
5+
fn to_str() -> ~str;
66
}
77

8-
impl of to_str for str {
9-
fn to_str() -> str { self }
8+
impl of to_str for ~str {
9+
fn to_str() -> ~str { self }
1010
}

trunk/src/test/auxiliary/issue_2242_b.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ use a;
55
import a::to_str;
66

77
impl of to_str for int {
8-
fn to_str() -> str { fmt!{"%?", self} }
8+
fn to_str() -> ~str { fmt!{"%?", self} }
99
}

trunk/src/test/auxiliary/issue_2242_c.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@ use a;
66
import a::to_str;
77

88
impl of to_str for bool {
9-
fn to_str() -> str { fmt!{"%b", self} }
9+
fn to_str() -> ~str { fmt!{"%b", self} }
1010
}
Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// xfail-test
21
// aux-build:issue_2242_a.rs
32
// aux-build:issue_2242_b.rs
43
// aux-build:issue_2242_c.rs
@@ -7,11 +6,10 @@ use a;
76
use b;
87
use c;
98

10-
import b::to_str;
11-
import c::to_str;
9+
import a::to_str;
1210

1311
fn main() {
14-
io::println("foo".to_str());
12+
io::println((~"foo").to_str());
1513
io::println(1.to_str());
1614
io::println(true.to_str());
1715
}

0 commit comments

Comments
 (0)