diff options
| author | Nick Desaulniers <ndesaulniers@mozilla.com> | 2013-01-31 17:51:01 -0800 |
|---|---|---|
| committer | Nick Desaulniers <ndesaulniers@mozilla.com> | 2013-01-31 22:25:12 -0800 |
| commit | 6fb4239bb361a927582a8ffd53a2ae649d810fdf (patch) | |
| tree | 9d0d7284aa54be4b26fc21a38a270904c1159693 /src/libstd | |
| parent | adb9d0e8a13131ff3efab6dbb1878774588100fd (diff) | |
| download | rust-6fb4239bb361a927582a8ffd53a2ae649d810fdf.tar.gz rust-6fb4239bb361a927582a8ffd53a2ae649d810fdf.zip | |
Replace most invocations of fail keyword with die! macro
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/bigint.rs | 2 | ||||
| -rw-r--r-- | src/libstd/net_tcp.rs | 2 | ||||
| -rw-r--r-- | src/libstd/test.rs | 4 | ||||
| -rw-r--r-- | src/libstd/uv_global_loop.rs | 8 |
4 files changed, 7 insertions, 9 deletions
diff --git a/src/libstd/bigint.rs b/src/libstd/bigint.rs index 2ccf3477141..0104e72764f 100644 --- a/src/libstd/bigint.rs +++ b/src/libstd/bigint.rs @@ -245,7 +245,7 @@ impl BigUint : Modulo<BigUint, BigUint> { } impl BigUint : Neg<BigUint> { - 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 91fdd07f65f..b86286a198d 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 c287872996c..5a2693a42c1 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 8ae3e24abee..736954f6b22 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()"); } } }; |