diff --git a/src/libcargo/cargo.rc b/src/libcargo/cargo.rc
index 4027677a3b07..0f3e1e1fc779 100644
--- a/src/libcargo/cargo.rc
+++ b/src/libcargo/cargo.rc
@@ -460,7 +460,7 @@ pub fn parse_source(name: ~str, j: &json::Json) -> @Source {
json::Object(j) => {
let mut url = match j.find(&~"url") {
Some(&json::String(u)) => copy u,
- _ => fail ~"needed 'url' field in source"
+ _ => die!(~"needed 'url' field in source")
};
let method = match j.find(&~"method") {
Some(&json::String(u)) => copy u,
diff --git a/src/libcore/dvec.rs b/src/libcore/dvec.rs
index 8b1a16a725ae..2fd7d71a7fc5 100644
--- a/src/libcore/dvec.rs
+++ b/src/libcore/dvec.rs
@@ -179,7 +179,7 @@ impl DVec {
let mut data = cast::reinterpret_cast(&null::<()>());
data <-> self.data;
let data_ptr: *() = cast::reinterpret_cast(&data);
- if data_ptr.is_null() { fail ~"Recursive use of dvec"; }
+ if data_ptr.is_null() { die!(~"Recursive use of dvec"); }
self.data = move ~[move t];
self.data.push_all_move(move data);
}
diff --git a/src/libcore/hashmap.rs b/src/libcore/hashmap.rs
index 2cf7053246d8..adb16a929055 100644
--- a/src/libcore/hashmap.rs
+++ b/src/libcore/hashmap.rs
@@ -386,7 +386,7 @@ pub mod linear {
pure fn get(&self, k: &K) -> &self/V {
match self.find(k) {
Some(v) => v,
- None => fail fmt!("No entry found for key: %?", k),
+ None => die!(fmt!("No entry found for key: %?", k)),
}
}
}
diff --git a/src/libcore/pipes.rs b/src/libcore/pipes.rs
index 5f6ee3baf023..15d118a9a7f9 100644
--- a/src/libcore/pipes.rs
+++ b/src/libcore/pipes.rs
@@ -1020,7 +1020,7 @@ impl SendPacketBuffered {
//forget(packet);
header
},
- None => fail ~"packet already consumed"
+ None => die!(~"packet already consumed")
}
}
diff --git a/src/libcore/task/mod.rs b/src/libcore/task/mod.rs
index a34956c87bad..d276f0c6ea9e 100644
--- a/src/libcore/task/mod.rs
+++ b/src/libcore/task/mod.rs
@@ -733,7 +733,7 @@ fn test_spawn_linked_sup_fail_up() { // child fails; parent fails
can_not_copy: None,
.. b0
};
- do b1.spawn { fail; }
+ do b1.spawn { die!(); }
po.recv(); // We should get punted awake
}
#[test] #[should_fail] #[ignore(cfg(windows))]
@@ -760,7 +760,7 @@ fn test_spawn_linked_sup_fail_down() { // parent fails; child fails
fn test_spawn_linked_unsup_fail_up() { // child fails; parent fails
let (po, _ch) = stream::<()>();
// Default options are to spawn linked & unsupervised.
- do spawn { fail; }
+ do spawn { die!(); }
po.recv(); // We should get punted awake
}
#[test] #[should_fail] #[ignore(cfg(windows))]
diff --git a/src/libcore/task/spawn.rs b/src/libcore/task/spawn.rs
index e5fa0db63a1c..ce95cdd02050 100644
--- a/src/libcore/task/spawn.rs
+++ b/src/libcore/task/spawn.rs
@@ -646,25 +646,25 @@ pub fn spawn_raw(opts: TaskOpts, f: fn~()) {
fn new_task_in_sched(opts: SchedOpts) -> *rust_task {
if opts.foreign_stack_size != None {
- fail ~"foreign_stack_size scheduler option unimplemented";
+ die!(~"foreign_stack_size scheduler option unimplemented");
}
let num_threads = match opts.mode {
- DefaultScheduler
- | CurrentScheduler
- | ExistingScheduler(*)
- | PlatformThread => 0u, /* Won't be used */
- SingleThreaded => 1u,
- ThreadPerCore => unsafe { rt::rust_num_threads() },
- ThreadPerTask => {
- fail ~"ThreadPerTask scheduling mode unimplemented"
- }
- ManualThreads(threads) => {
- if threads == 0u {
- fail ~"can not create a scheduler with no threads";
+ DefaultScheduler
+ | CurrentScheduler
+ | ExistingScheduler(*)
+ | PlatformThread => 0u, /* Won't be used */
+ SingleThreaded => 1u,
+ ThreadPerCore => unsafe { rt::rust_num_threads() },
+ ThreadPerTask => {
+ die!(~"ThreadPerTask scheduling mode unimplemented")
+ }
+ ManualThreads(threads) => {
+ if threads == 0u {
+ die!(~"can not create a scheduler with no threads");
+ }
+ threads
}
- threads
- }
};
unsafe {
diff --git a/src/librustc/metadata/encoder.rs b/src/librustc/metadata/encoder.rs
index 0f61d12d7c84..33879237ffb4 100644
--- a/src/librustc/metadata/encoder.rs
+++ b/src/librustc/metadata/encoder.rs
@@ -886,7 +886,7 @@ fn encode_info_for_items(ecx: @encode_ctxt, ebml_w: writer::Encoder,
encode_info_for_item(ecx, ebml_w, i,
index, *pt);
}
- _ => fail ~"bad item"
+ _ => die!(~"bad item")
}
}
},
@@ -901,7 +901,7 @@ fn encode_info_for_items(ecx: @encode_ctxt, ebml_w: writer::Encoder,
abi);
}
// case for separate item and foreign-item tables
- _ => fail ~"bad foreign item"
+ _ => die!(~"bad foreign item")
}
}
},
diff --git a/src/librustc/middle/trans/meth.rs b/src/librustc/middle/trans/meth.rs
index d1621233f5dd..5a5644fefb97 100644
--- a/src/librustc/middle/trans/meth.rs
+++ b/src/librustc/middle/trans/meth.rs
@@ -265,7 +265,8 @@ pub fn trans_method_callee(bcx: block,
mentry.explicit_self)
}
typeck::method_self(*) | typeck::method_super(*) => {
- fail ~"method_self or method_super should have been handled above"
+ die!(~"method_self or method_super should have been handled \
+ above")
}
}
}
diff --git a/src/librustc/middle/ty.rs b/src/librustc/middle/ty.rs
index b07e3ef7b817..db5ddfb92577 100644
--- a/src/librustc/middle/ty.rs
+++ b/src/librustc/middle/ty.rs
@@ -2868,7 +2868,8 @@ pub fn ty_region(ty: t) -> Region {
ty_rptr(r, _) => r,
ty_evec(_, vstore_slice(r)) => r,
ty_estr(vstore_slice(r)) => r,
- ref s => fail fmt!("ty_region() invoked on in appropriate ty: %?", (*s))
+ ref s => die!(fmt!("ty_region() invoked on in appropriate ty: %?",
+ (*s)))
}
}
diff --git a/src/librustc/middle/typeck/check/method.rs b/src/librustc/middle/typeck/check/method.rs
index 44dd65f238b3..c3524e0740d8 100644
--- a/src/librustc/middle/typeck/check/method.rs
+++ b/src/librustc/middle/typeck/check/method.rs
@@ -1233,7 +1233,7 @@ pub impl LookupContext {
let span = if did.crate == ast::local_crate {
match self.tcx().items.find(did.node) {
Some(ast_map::node_method(m, _, _)) => m.span,
- _ => fail fmt!("report_static_candidate: bad item %?", did)
+ _ => die!(fmt!("report_static_candidate: bad item %?", did))
}
} else {
self.expr.span
diff --git a/src/librustdoc/attr_pass.rs b/src/librustdoc/attr_pass.rs
index 80cf679ddaaf..4abd1f18f388 100644
--- a/src/librustdoc/attr_pass.rs
+++ b/src/librustdoc/attr_pass.rs
@@ -118,7 +118,7 @@ fn parse_item_attrs(
let attrs = match ctxt.ast_map.get(id) {
ast_map::node_item(item, _) => copy item.attrs,
ast_map::node_foreign_item(item, _, _) => copy item.attrs,
- _ => fail ~"parse_item_attrs: not an item"
+ _ => die!(~"parse_item_attrs: not an item")
};
parse_attrs(attrs)
}
@@ -182,9 +182,9 @@ fn fold_enum(
copy ast_variant.node.attrs)
}
_ => {
- fail fmt!("Enum variant %s has id that's \
+ die!(fmt!("Enum variant %s has id that's \
not bound to an enum item",
- variant.name)
+ variant.name))
}
}
}
diff --git a/src/librustdoc/demo.rs b/src/librustdoc/demo.rs
index d069fc142074..ff6b745612de 100644
--- a/src/librustdoc/demo.rs
+++ b/src/librustdoc/demo.rs
@@ -192,6 +192,6 @@ impl OmNomNomy: TheShunnedHouse {
}
fn construct(&self) -> bool {
- fail;
+ die!();
}
}
diff --git a/src/librustdoc/tystr_pass.rs b/src/librustdoc/tystr_pass.rs
index 7ef7cd390075..92db56b40af0 100644
--- a/src/librustdoc/tystr_pass.rs
+++ b/src/librustdoc/tystr_pass.rs
@@ -112,7 +112,7 @@ fn fold_const(
}, _) => {
pprust::ty_to_str(ty, extract::interner())
}
- _ => fail ~"fold_const: id not bound to a const item"
+ _ => die!(~"fold_const: id not bound to a const item")
}
}}),
.. doc
@@ -149,7 +149,7 @@ fn fold_enum(
pprust::variant_to_str(
ast_variant, extract::interner())
}
- _ => fail ~"enum variant not bound to an enum item"
+ _ => die!(~"enum variant not bound to an enum item")
}
}
};
@@ -281,7 +281,7 @@ fn fold_impl(
Some(pprust::ty_to_str(
self_ty, extract::interner())))
}
- _ => fail ~"expected impl"
+ _ => die!(~"expected impl")
}
}
};
@@ -344,7 +344,7 @@ fn fold_type(
extract::interner())
))
}
- _ => fail ~"expected type"
+ _ => die!(~"expected type")
}
}
},
@@ -374,7 +374,7 @@ fn fold_struct(
Some(pprust::item_to_str(item,
extract::interner()))
}
- _ => fail ~"not an item"
+ _ => die!(~"not an item")
}
}
},
diff --git a/src/libstd/bigint.rs b/src/libstd/bigint.rs
index 2ccf34771415..0104e72764f6 100644
--- a/src/libstd/bigint.rs
+++ b/src/libstd/bigint.rs
@@ -245,7 +245,7 @@ impl BigUint : Modulo {
}
impl BigUint : Neg {
- pure fn neg(&self) -> BigUint { fail }
+ pure fn neg(&self) -> BigUint { die!() }
}
impl BigUint : IntConvertible {
diff --git a/src/libstd/net_tcp.rs b/src/libstd/net_tcp.rs
index 91fdd07f65fd..b86286a198da 100644
--- a/src/libstd/net_tcp.rs
+++ b/src/libstd/net_tcp.rs
@@ -940,7 +940,7 @@ impl TcpSocketBuf: io::Reader {
} else {
debug!("ERROR sock_buf as io::reader.read err %? %?",
err_data.err_name, err_data.err_msg);
- fail
+ die!()
}
}
else {
diff --git a/src/libstd/test.rs b/src/libstd/test.rs
index c287872996c7..5a2693a42c14 100644
--- a/src/libstd/test.rs
+++ b/src/libstd/test.rs
@@ -446,7 +446,7 @@ mod tests {
#[test]
pub fn do_not_run_ignored_tests() {
- fn f() { fail; }
+ fn f() { die!(); }
let desc = TestDesc {
name: ~"whatever",
testfn: f,
@@ -479,7 +479,7 @@ mod tests {
#[test]
#[ignore(cfg(windows))]
pub fn test_should_fail() {
- fn f() { fail; }
+ fn f() { die!(); }
let desc = TestDesc {
name: ~"whatever",
testfn: f,
diff --git a/src/libstd/uv_global_loop.rs b/src/libstd/uv_global_loop.rs
index 8ae3e24abee4..736954f6b222 100644
--- a/src/libstd/uv_global_loop.rs
+++ b/src/libstd/uv_global_loop.rs
@@ -185,14 +185,12 @@ mod test {
let start_status = ll::timer_start(timer_ptr,
simple_timer_cb,
1u, 0u);
- if(start_status == 0i32) {
- }
- else {
- fail ~"failure on ll::timer_start()";
+ if(start_status != 0i32) {
+ die!(~"failure on ll::timer_start()");
}
}
else {
- fail ~"failure on ll::timer_init()";
+ die!(~"failure on ll::timer_init()");
}
}
};
diff --git a/src/test/auxiliary/issue_2723_a.rs b/src/test/auxiliary/issue_2723_a.rs
index 5afb2161b413..ef74b61f93ae 100644
--- a/src/test/auxiliary/issue_2723_a.rs
+++ b/src/test/auxiliary/issue_2723_a.rs
@@ -9,5 +9,5 @@
// except according to those terms.
pub unsafe fn f(xs: ~[int]) {
- xs.map(|_x| { unsafe fn q() { fail; } });
+ xs.map(|_x| { unsafe fn q() { die!(); } });
}
diff --git a/src/test/bench/shootout-pfib.rs b/src/test/bench/shootout-pfib.rs
index c146b6ac3711..06b46eab7598 100644
--- a/src/test/bench/shootout-pfib.rs
+++ b/src/test/bench/shootout-pfib.rs
@@ -68,7 +68,7 @@ fn parse_opts(argv: ~[~str]) -> Config {
Ok(ref m) => {
return Config {stress: getopts::opt_present(m, ~"stress")}
}
- Err(_) => { fail; }
+ Err(_) => { die!(); }
}
}
diff --git a/src/test/compile-fail/borrowck-vec-pattern-element-loan.rs b/src/test/compile-fail/borrowck-vec-pattern-element-loan.rs
index 358917de85fb..940677002707 100644
--- a/src/test/compile-fail/borrowck-vec-pattern-element-loan.rs
+++ b/src/test/compile-fail/borrowck-vec-pattern-element-loan.rs
@@ -2,7 +2,7 @@ fn a() -> &[int] {
let vec = [1, 2, 3, 4];
let tail = match vec { //~ ERROR illegal borrow
[_a, ..tail] => tail,
- _ => fail ~"foo"
+ _ => die!(~"foo")
};
move tail
}
diff --git a/src/test/compile-fail/borrowck-vec-pattern-tail-element-loan.rs b/src/test/compile-fail/borrowck-vec-pattern-tail-element-loan.rs
index 6477fd9fb2cf..64bb571b2dcd 100644
--- a/src/test/compile-fail/borrowck-vec-pattern-tail-element-loan.rs
+++ b/src/test/compile-fail/borrowck-vec-pattern-tail-element-loan.rs
@@ -2,7 +2,7 @@ fn a() -> &int {
let vec = [1, 2, 3, 4];
let tail = match vec { //~ ERROR illegal borrow
[_a, ..tail] => &tail[0],
- _ => fail ~"foo"
+ _ => die!(~"foo")
};
move tail
}
diff --git a/src/test/run-fail/task-comm-recv-block.rs b/src/test/run-fail/task-comm-recv-block.rs
index fc108a4fbdd1..0b36977d9b55 100644
--- a/src/test/run-fail/task-comm-recv-block.rs
+++ b/src/test/run-fail/task-comm-recv-block.rs
@@ -21,5 +21,5 @@ fn main() {
// We shouldn't be able to get past this recv since there's no
// message available
let i: int = po.recv();
- fail ~"badfail";
+ die!(~"badfail");
}