diff --git a/src/bn/mod.rs b/src/bn/mod.rs index 0900f478..a3ac8ffd 100644 --- a/src/bn/mod.rs +++ b/src/bn/mod.rs @@ -473,7 +473,7 @@ pub mod unchecked { unsafe { let r = ffi::BN_dup(self.raw()); if r.is_null() { - fail!("Unexpected null pointer from BN_dup(..)") + panic!("Unexpected null pointer from BN_dup(..)") } else { BigNum(r) } diff --git a/src/crypto/memcmp.rs b/src/crypto/memcmp.rs index c30281d4..7473fcab 100644 --- a/src/crypto/memcmp.rs +++ b/src/crypto/memcmp.rs @@ -8,7 +8,7 @@ use ffi; /// /// # Failure /// -/// This function will fail the current task if `a` and `b` do not have the same +/// This function will panic the current task if `a` and `b` do not have the same /// length. pub fn eq(a: &[u8], b: &[u8]) -> bool { assert!(a.len() == b.len()); diff --git a/src/crypto/pkcs5.rs b/src/crypto/pkcs5.rs index feaff9c8..6efd23ff 100644 --- a/src/crypto/pkcs5.rs +++ b/src/crypto/pkcs5.rs @@ -17,7 +17,7 @@ pub fn pbkdf2_hmac_sha1(pass: &str, salt: &[u8], iter: uint, keylen: uint) -> Ve iter as c_int, keylen as c_int, out.as_mut_ptr()); - if r != 1 { fail!(); } + if r != 1 { panic!(); } out.set_len(keylen); diff --git a/src/crypto/rand.rs b/src/crypto/rand.rs index 5f94c93c..92d38f2c 100644 --- a/src/crypto/rand.rs +++ b/src/crypto/rand.rs @@ -7,7 +7,7 @@ pub fn rand_bytes(len: uint) -> Vec { ffi::init(); let r = ffi::RAND_bytes(out.as_mut_ptr(), len as c_int); - if r != 1 as c_int { fail!() } + if r != 1 as c_int { panic!() } out.set_len(len); diff --git a/src/crypto/symm.rs b/src/crypto/symm.rs index 171c1b05..954fa298 100644 --- a/src/crypto/symm.rs +++ b/src/crypto/symm.rs @@ -214,7 +214,7 @@ mod tests { println!("Lengths differ: {} in computed vs {} expected", computed.len(), expected.len()); } - fail!("test failure"); + panic!("test failure"); } } diff --git a/src/ssl/error.rs b/src/ssl/error.rs index 5af6c866..7066299f 100644 --- a/src/ssl/error.rs +++ b/src/ssl/error.rs @@ -74,7 +74,7 @@ impl SslError { fn test_uknown_error_should_have_correct_messages() { let errs = match SslError::from_error(336032784) { OpenSslErrors(errs) => errs, - _ => fail!("This should always be an `OpenSslErrors` variant.") + _ => panic!("This should always be an `OpenSslErrors` variant.") }; let UnknownError { ref library, ref function, ref reason } = errs[0]; diff --git a/src/ssl/tests.rs b/src/ssl/tests.rs index 5a47aa5f..c5abdd52 100644 --- a/src/ssl/tests.rs +++ b/src/ssl/tests.rs @@ -24,7 +24,7 @@ fn test_verify_untrusted() { let mut ctx = SslContext::new(Sslv23).unwrap(); ctx.set_verify(SslVerifyPeer, None); match SslStream::new(&ctx, stream) { - Ok(_) => fail!("expected failure"), + Ok(_) => panic!("expected failure"), Err(err) => println!("error {}", err) } } @@ -36,11 +36,11 @@ fn test_verify_trusted() { ctx.set_verify(SslVerifyPeer, None); match ctx.set_CA_file(&Path::new("test/cert.pem")) { None => {} - Some(err) => fail!("Unexpected error {}", err) + Some(err) => panic!("Unexpected error {}", err) } match SslStream::new(&ctx, stream) { Ok(_) => (), - Err(err) => fail!("Expected success, got {}", err) + Err(err) => panic!("Expected success, got {}", err) } } @@ -54,7 +54,7 @@ fn test_verify_untrusted_callback_override_ok() { ctx.set_verify(SslVerifyPeer, Some(callback)); match SslStream::new(&ctx, stream) { Ok(_) => (), - Err(err) => fail!("Expected success, got {}", err) + Err(err) => panic!("Expected success, got {}", err) } } @@ -79,11 +79,11 @@ fn test_verify_trusted_callback_override_ok() { ctx.set_verify(SslVerifyPeer, Some(callback)); match ctx.set_CA_file(&Path::new("test/cert.pem")) { None => {} - Some(err) => fail!("Unexpected error {}", err) + Some(err) => panic!("Unexpected error {}", err) } match SslStream::new(&ctx, stream) { Ok(_) => (), - Err(err) => fail!("Expected success, got {}", err) + Err(err) => panic!("Expected success, got {}", err) } } @@ -97,7 +97,7 @@ fn test_verify_trusted_callback_override_bad() { ctx.set_verify(SslVerifyPeer, Some(callback)); match ctx.set_CA_file(&Path::new("test/cert.pem")) { None => {} - Some(err) => fail!("Unexpected error {}", err) + Some(err) => panic!("Unexpected error {}", err) } assert!(SslStream::new(&ctx, stream).is_err()); } @@ -125,7 +125,7 @@ fn test_verify_trusted_get_error_ok() { ctx.set_verify(SslVerifyPeer, Some(callback)); match ctx.set_CA_file(&Path::new("test/cert.pem")) { None => {} - Some(err) => fail!("Unexpected error {}", err) + Some(err) => panic!("Unexpected error {}", err) } assert!(SslStream::new(&ctx, stream).is_ok()); } @@ -168,7 +168,7 @@ fn test_verify_callback_data() { match SslStream::new(&ctx, stream) { Ok(_) => (), - Err(err) => fail!("Expected success, got {}", err) + Err(err) => panic!("Expected success, got {}", err) } } diff --git a/src/x509/mod.rs b/src/x509/mod.rs index 94934b25..48b5d455 100644 --- a/src/x509/mod.rs +++ b/src/x509/mod.rs @@ -390,7 +390,7 @@ impl<'ctx> X509<'ctx> { match len.cmp(&act_len) { Greater => None, Equal => Some(v), - Less => fail!("Fingerprint buffer was corrupted!") + Less => panic!("Fingerprint buffer was corrupted!") } } }