---

yaml
---
r: 3871
b: refs/heads/master
c: e53cfb9
h: refs/heads/master
i:
  3869: c7f9b1c
  3867: ba8c323
  3863: 68c2977
  3855: af06fba
  3839: 6e467bf
v: v3

Author: graydon

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e827eab241e5699dea840ae5fa6b1bdd9570aff
+refs/heads/master: e53cfb979b20b357b09e4fcd63278c1f58e19c5e

trunk/src/comp/syntax/codemap.rs

@@ -63,7 +63,10 @@ fn emit_diagnostic(&option::t[span] sp, &str msg, &str kind, u8 color,
     alt (sp) {
         case (some(?ssp)) {
             ss = span_to_str(ssp, cm);
-            maybe_lines = some(span_to_lines(ssp, cm));
+
+            // FIXME: we're not able to look up lines read from .rc files yet.
+            // maybe_lines = some(span_to_lines(ssp, cm));
+
         }
         case (none) { }
     }

trunk/src/etc/combine-tests.py

@@ -25,7 +25,8 @@ def scrub(b):
     if t.endswith(".rs"):
         f = codecs.open(os.path.join(run_pass, t), "r", "utf8")
         s = f.read()
-        if not ("xfail-stage2" in s):
+        if not ("xfail-stage2" in s or
+                "xfail-fast" in s):
             stage2_tests.append(t)
             if "main(vec[str] args)" in s:
                 take_args[t] = True

trunk/src/test/run-pass/global-scope.rs

@@ -1,4 +1,5 @@
 // xfail-stage0
+// xfail-fast
 
 fn f() -> int { ret 1; }