Commit e8b79750 authored by Steven Fackler's avatar Steven Fackler
Browse files

Remove use of {:?}

parent 7d313310

crypto/rand.rs

+1 −1
Original line number Diff line number Diff line
@@ -26,6 +26,6 @@ mod tests { 
    #[test]

    fn test_rand_bytes() {

        let bytes = rand_bytes(32u);

        println!("{:?}", bytes);

        println!("{}", bytes);

    }

}

ssl/mod.rs

+2 −2
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ impl SslContext { 
    pub fn new(method: SslMethod) -> SslContext {

        match SslContext::try_new(method) {

            Ok(ctx) => ctx,

            Err(err) => fail!("Error creating SSL context: {:?}", err)

            Err(err) => fail!("Error creating SSL context: {}", err)

        }

    }
@@ -490,7 +490,7 @@ impl<S: Stream> SslStream<S> { 
    pub fn new(ctx: &SslContext, stream: S) -> SslStream<S> {

        match SslStream::try_new(ctx, stream) {

            Ok(stream) => stream,

            Err(err) => fail!("Error creating SSL stream: {:?}", err)

            Err(err) => fail!("Error creating SSL stream: {}", err)

        }

    }

ssl/tests.rs

+8 −8
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ fn test_verify_untrusted() { 
    ctx.set_verify(SslVerifyPeer, None);

    match SslStream::try_new(&ctx, stream) {

        Ok(_) => fail!("expected failure"),

        Err(err) => println!("error {:?}", err)

        Err(err) => println!("error {}", err)

    }

}
@@ -34,11 +34,11 @@ fn test_verify_trusted() { 
    ctx.set_verify(SslVerifyPeer, None);

    match ctx.set_CA_file("test/cert.pem") {

        None => {}

        Some(err) => fail!("Unexpected error {:?}", err)

        Some(err) => fail!("Unexpected error {}", err)

    }

    match SslStream::try_new(&ctx, stream) {

        Ok(_) => (),

        Err(err) => fail!("Expected success, got {:?}", err)

        Err(err) => fail!("Expected success, got {}", err)

    }

}
@@ -52,7 +52,7 @@ fn test_verify_untrusted_callback_override_ok() { 
    ctx.set_verify(SslVerifyPeer, Some(callback));

    match SslStream::try_new(&ctx, stream) {

        Ok(_) => (),

        Err(err) => fail!("Expected success, got {:?}", err)

        Err(err) => fail!("Expected success, got {}", err)

    }

}
@@ -77,11 +77,11 @@ fn test_verify_trusted_callback_override_ok() { 
    ctx.set_verify(SslVerifyPeer, Some(callback));

    match ctx.set_CA_file("test/cert.pem") {

        None => {}

        Some(err) => fail!("Unexpected error {:?}", err)

        Some(err) => fail!("Unexpected error {}", err)

    }

    match SslStream::try_new(&ctx, stream) {

        Ok(_) => (),

        Err(err) => fail!("Expected success, got {:?}", err)

        Err(err) => fail!("Expected success, got {}", err)

    }

}
@@ -95,7 +95,7 @@ fn test_verify_trusted_callback_override_bad() { 
    ctx.set_verify(SslVerifyPeer, Some(callback));

    match ctx.set_CA_file("test/cert.pem") {

        None => {}

        Some(err) => fail!("Unexpected error {:?}", err)

        Some(err) => fail!("Unexpected error {}", err)

    }

    assert!(SslStream::try_new(&ctx, stream).is_err());

}
@@ -123,7 +123,7 @@ fn test_verify_trusted_get_error_ok() { 
    ctx.set_verify(SslVerifyPeer, Some(callback));

    match ctx.set_CA_file("test/cert.pem") {

        None => {}

        Some(err) => fail!("Unexpected error {:?}", err)

        Some(err) => fail!("Unexpected error {}", err)

    }

    assert!(SslStream::try_new(&ctx, stream).is_ok());

}