diff options
| author | bors <bors@rust-lang.org> | 2013-02-14 15:37:48 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-02-14 15:37:48 -0800 |
| commit | 3c07d037cd38204bda1ff9c564b6c1941c25138f (patch) | |
| tree | ed3c158690080b922ec4d34836b7e15b76f118c7 /src/libstd | |
| parent | 03743ee449afb423d4a84f16976589bfd49acbf6 (diff) | |
| parent | 4699ac67c6b48331852f3960430a3c8cfcaf7b90 (diff) | |
| download | rust-3c07d037cd38204bda1ff9c564b6c1941c25138f.tar.gz rust-3c07d037cd38204bda1ff9c564b6c1941c25138f.zip | |
auto merge of #4934 : nickdesaulniers/rust/issue4524cleanup, r=brson
review? @brson Issue #4524
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/json.rs | 4 | ||||
| -rw-r--r-- | src/libstd/test.rs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/json.rs b/src/libstd/json.rs index fcdd2de5743..088afe4778e 100644 --- a/src/libstd/json.rs +++ b/src/libstd/json.rs @@ -1284,13 +1284,13 @@ mod tests { // Should they be in their own crate? pub pure fn check_equal_ptr<T : cmp::Eq> (given : &T, expected: &T) { if !((given == expected) && (expected == given )) { - die!(fmt!("given %?, expected %?",given,expected)); + fail!(fmt!("given %?, expected %?",given,expected)); } } pub pure fn check_equal<T : cmp::Eq> (given : T, expected: T) { if !((given == expected) && (expected == given )) { - die!(fmt!("given %?, expected %?",given,expected)); + fail!(fmt!("given %?, expected %?",given,expected)); } } diff --git a/src/libstd/test.rs b/src/libstd/test.rs index 530761e48a2..2eae377b91a 100644 --- a/src/libstd/test.rs +++ b/src/libstd/test.rs @@ -143,7 +143,7 @@ pub fn test_main_static(args: &[~str], tests: &[TestDescAndFn]) { TestDescAndFn { testfn: StaticBenchFn(f), desc: copy t.desc }, _ => { - die! (~"non-static tests passed to test::test_main_static"); + fail!(~"non-static tests passed to test::test_main_static"); } } }; |