aboutsummaryrefslogtreecommitdiff
path: root/src/ssl
diff options
context:
space:
mode:
authorSteven Fackler <[email protected]>2014-10-30 10:58:51 -0400
committerSteven Fackler <[email protected]>2014-10-30 10:58:51 -0400
commit66df9154a6fcc468f91b326a3c2b8e8850d75b19 (patch)
tree5af156761bbcce3bb905013ff80bfc9892f26f9d /src/ssl
parentClean up some BN stuff (diff)
parentfail! -> panic! (diff)
downloadrust-openssl-66df9154a6fcc468f91b326a3c2b8e8850d75b19.tar.xz
rust-openssl-66df9154a6fcc468f91b326a3c2b8e8850d75b19.zip
Merge pull request #90 from ebfe/fix-build
fail! -> panic!
Diffstat (limited to 'src/ssl')
-rw-r--r--src/ssl/error.rs2
-rw-r--r--src/ssl/tests.rs18
2 files changed, 10 insertions, 10 deletions
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)
}
}