about summary refs log tree commit diff
path: root/src/libsyntax/codemap.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-02-13 17:11:08 -0800
committerbors <bors@rust-lang.org>2013-02-13 17:11:08 -0800
commit0ae74bef188fe4f1fff69c0fa85d308c40bce7f8 (patch)
treef5258cb43faeb5f36f816e4a2d04442c987423b4 /src/libsyntax/codemap.rs
parentc51ecc3223ed64b7948f40097c5083da0c201811 (diff)
parent4445b38df27777b043cad9ecc2452daad3469949 (diff)
downloadrust-0ae74bef188fe4f1fff69c0fa85d308c40bce7f8.tar.gz
rust-0ae74bef188fe4f1fff69c0fa85d308c40bce7f8.zip
auto merge of #4905 : brson/rust/issue4524, r=brson
Rebase of #4895
Diffstat (limited to 'src/libsyntax/codemap.rs')
-rw-r--r--src/libsyntax/codemap.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax/codemap.rs b/src/libsyntax/codemap.rs
index a509325face..b41e84a04f8 100644
--- a/src/libsyntax/codemap.rs
+++ b/src/libsyntax/codemap.rs
@@ -401,7 +401,7 @@ pub impl CodeMap {
         for self.files.each |fm| { if fm.name == filename { return *fm; } }
         //XXjdm the following triggers a mismatched type bug
         //      (or expected function, found _|_)
-        die!(); // ("asking for " + filename + " which we don't know about");
+        fail!(); // ("asking for " + filename + " which we don't know about");
     }
 
 }
@@ -421,7 +421,7 @@ priv impl CodeMap {
             }
         }
         if (a >= len) {
-            die!(fmt!("position %u does not resolve to a source location",
+            fail!(fmt!("position %u does not resolve to a source location",
                       pos.to_uint()))
         }