Unverified Commit c13d0a21 authored by Jonas Platte's avatar Jonas Platte
Browse files

Use edition 2018 idioms and warn when they are not followed 

This was mostly automated using `cargo fix --edition-idioms`.
parent 0dc50fbf

openssl/examples/mk_certs.rs

+0 −2
Original line number Diff line number Diff line 
//! A program that generates ca certs, certs verified by the ca, and public

//! and private keys.



extern crate openssl;



use openssl::asn1::Asn1Time;

use openssl::bn::{BigNum, MsbOption};

use openssl::error::ErrorStack;

openssl/src/asn1.rs

+6 −6
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ foreign_type_and_impl_send_sync! { 
}



impl fmt::Display for Asn1GeneralizedTimeRef {

    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {

    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {

        unsafe {

            let mem_bio = match MemBio::new() {

                Err(_) => return f.write_str("error"),
@@ -284,7 +284,7 @@ impl<'a> PartialOrd<Asn1Time> for &'a Asn1TimeRef { 
}



impl fmt::Display for Asn1TimeRef {

    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {

    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {

        unsafe {

            let mem_bio = match MemBio::new() {

                Err(_) => return f.write_str("error"),
@@ -300,7 +300,7 @@ impl fmt::Display for Asn1TimeRef { 
}



impl fmt::Debug for Asn1TimeRef {

    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {

    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {

        f.write_str(&self.to_string())

    }

}
@@ -481,7 +481,7 @@ impl Asn1StringRef { 
}



impl fmt::Debug for Asn1StringRef {

    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {

    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {

        match self.as_utf8() {

            Ok(openssl_string) => openssl_string.fmt(fmt),

            Err(_) => fmt.write_str("error"),
@@ -636,7 +636,7 @@ impl Asn1ObjectRef { 
}



impl fmt::Display for Asn1ObjectRef {

    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {

    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {

        unsafe {

            let mut buf = [0; 80];

            let len = ffi::OBJ_obj2txt(
@@ -654,7 +654,7 @@ impl fmt::Display for Asn1ObjectRef { 
}



impl fmt::Debug for Asn1ObjectRef {

    fn fmt(&self, fmt: &mut fmt::Formatter) -> fmt::Result {

    fn fmt(&self, fmt: &mut fmt::Formatter<'_>) -> fmt::Result {

        fmt.write_str(self.to_string().as_str())

    }

}

openssl/src/bn.rs

+4 −4
Original line number Diff line number Diff line
@@ -1122,7 +1122,7 @@ impl BigNum { 
}



impl fmt::Debug for BigNumRef {

    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {

    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {

        match self.to_dec_str() {

            Ok(s) => f.write_str(&s),

            Err(e) => Err(e.into()),
@@ -1131,7 +1131,7 @@ impl fmt::Debug for BigNumRef { 
}



impl fmt::Debug for BigNum {

    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {

    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {

        match self.to_dec_str() {

            Ok(s) => f.write_str(&s),

            Err(e) => Err(e.into()),
@@ -1140,7 +1140,7 @@ impl fmt::Debug for BigNum { 
}



impl fmt::Display for BigNumRef {

    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {

    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {

        match self.to_dec_str() {

            Ok(s) => f.write_str(&s),

            Err(e) => Err(e.into()),
@@ -1149,7 +1149,7 @@ impl fmt::Display for BigNumRef { 
}



impl fmt::Display for BigNum {

    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {

    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {

        match self.to_dec_str() {

            Ok(s) => f.write_str(&s),

            Err(e) => Err(e.into()),

openssl/src/dsa.rs

+1 −1
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ impl Dsa<Public> { 
}



impl<T> fmt::Debug for Dsa<T> {

    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {

    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {

        write!(f, "DSA")

    }

}

openssl/src/ec.rs

+1 −1
Original line number Diff line number Diff line
@@ -915,7 +915,7 @@ impl<T> Clone for EcKey<T> { 
}



impl<T> fmt::Debug for EcKey<T> {

    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {

    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {

        write!(f, "EcKey")

    }

}