---

yaml
---
r: 5257
b: refs/heads/master
c: c84b8e9
h: refs/heads/master
i:
  5255: e8eb891
v: v3

Author: msullivan

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b9267e8fbce647dfd1f8b3ecc7f4e4bd3dcf4af6
+refs/heads/master: c84b8e90b843ed65a29518432c5d490688560012

trunk/src/comp/util/ppaux.rs

@@ -31,10 +31,7 @@ fn get_id_ident(cx: ctxt, id: ast::def_id) -> str {
     if id.crate != ast::local_crate {
         alt cx.ext_map.find(id) {
           some(j) { str::connect(j, "::") }
-          _ {
-            fail "get_id_ident: can't find item in ext_map, id.crate = " +
-                     int::str(id.crate)
-          }
+          none. { "<#" + int::str(id.crate) + ":" + int::str(id.node) + ">" }
         }
     } else {
         alt cx.items.find(id.node) {

trunk/src/test/compile-fail/tag-that-dare-not-speak-its-name.rs

@@ -1,6 +1,6 @@
 // -*- rust -*-
 // xfail-test
-// error-pattern:mismatch
+// error-pattern:option::t
 use std;
 import std::vec::*;