---

catamorphism · catamorphism · commit b96bf5cf5c32 · 2012-12-07T23:42:58.000-08:00
yaml --- r: 36631 b: refs/heads/try2 c: 2c2398c h: refs/heads/master i: 36629: 4def865 36627: 5ba1798 36623: b4b3194 v: v3
diff --git a/[refs] b/[refs]
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 833eb7ae1da68ad3ad0cb51b3b28f207c435b931
+refs/heads/try2: 2c2398ca0d877390b9716cfa135b59418b9f6b5d
 refs/heads/incoming: d9317a174e434d4c99fc1a37fd7dc0d2f5328d37
 refs/heads/dist-snap: 22efa39382d41b084fde1719df7ae8ce5697d8c9
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
diff --git a/branches/try2/doc/rust.md b/branches/try2/doc/rust.md
@@ -2704,15 +2704,15 @@ The special type `self` has a meaning within methods inside an
 impl item. It refers to the type of the implicit `self` argument. For
 example, in:
 
-~~~~~~
+~~~~~~~~{.xfail-test}
 trait Printable {
   fn to_str() -> ~str;
 }
 
 impl ~str: Printable {
   fn to_str() -> ~str { copy self }
 }
-~~~~~~
+~~~~~~~~
 
 `self` refers to the value of type `~str` that is the receiver for a
 call to the method `to_str`.
diff --git a/branches/try2/src/test/bench/shootout-nbody.rs b/branches/try2/src/test/bench/shootout-nbody.rs
@@ -1,3 +1,4 @@
+// xfail-test
 // based on:
 // http://shootout.alioth.debian.org/u32/benchmark.php?test=nbody&lang=java
 
diff --git a/branches/try2/src/test/run-pass/stat.rs b/branches/try2/src/test/run-pass/stat.rs
@@ -1,3 +1,4 @@
+// xfail-test
 extern mod std;
 use io::WriterUtil;
 use std::tempfile;

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+// xfail-test`
`1`	`2`	`// based on:`
`2`	`3`	`// http://shootout.alioth.debian.org/u32/benchmark.php?test=nbody&lang=java`
`3`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+// xfail-test`
`1`	`2`	`extern mod std;`
`2`	`3`	`use io::WriterUtil;`
`3`	`4`	`use std::tempfile;`