Rewrite unidiomatic use of or() combinator

Author: djc

rcgen/src/certificate.rs

@@ -172,7 +172,7 @@ impl CertificateParams {
 	/// See [`from_ca_cert_der`](Self::from_ca_cert_der) for more details.
 	#[cfg(all(feature = "pem", feature = "x509-parser"))]
 	pub fn from_ca_cert_pem(pem_str: &str) -> Result<Self, Error> {
-		let certificate = pem::parse(pem_str).or(Err(Error::CouldNotParseCertificate))?;
+		let certificate = pem::parse(pem_str).map_err(|_| Error::CouldNotParseCertificate)?;
 		Self::from_ca_cert_der(&certificate.contents().into())
 	}
 
@@ -200,7 +200,7 @@ impl CertificateParams {
 	#[cfg(feature = "x509-parser")]
 	pub fn from_ca_cert_der(ca_cert: &CertificateDer<'_>) -> Result<Self, Error> {
 		let (_remainder, x509) = x509_parser::parse_x509_certificate(ca_cert)
-			.or(Err(Error::CouldNotParseCertificate))?;
+			.map_err(|_| Error::CouldNotParseCertificate)?;
 
 		Ok(CertificateParams {
 			is_ca: IsCa::from_x509(&x509)?,
@@ -805,7 +805,7 @@ impl ExtendedKeyUsagePurpose {
 	fn from_x509(x509: &x509_parser::certificate::X509Certificate<'_>) -> Result<Vec<Self>, Error> {
 		let extended_key_usage = x509
 			.extended_key_usage()
-			.or(Err(Error::CouldNotParseCertificate))?
+			.map_err(|_| Error::CouldNotParseCertificate)?
 			.map(|ext| ext.value);
 
 		let mut extended_key_usages = Vec::new();
@@ -872,7 +872,7 @@ impl NameConstraints {
 	) -> Result<Option<Self>, Error> {
 		let constraints = x509
 			.name_constraints()
-			.or(Err(Error::CouldNotParseCertificate))?
+			.map_err(|_| Error::CouldNotParseCertificate)?
 			.map(|ext| ext.value);
 
 		let Some(constraints) = constraints else {
@@ -1097,7 +1097,7 @@ impl IsCa {
 
 		let basic_constraints = x509
 			.basic_constraints()
-			.or(Err(Error::CouldNotParseCertificate))?
+			.map_err(|_| Error::CouldNotParseCertificate)?
 			.map(|ext| ext.value);
 
 		Ok(match basic_constraints {

rcgen/src/csr.rs

@@ -80,7 +80,7 @@ impl CertificateSigningRequestParams {
 	/// See [`from_der`](Self::from_der) for more details.
 	#[cfg(all(feature = "pem", feature = "x509-parser"))]
 	pub fn from_pem(pem_str: &str) -> Result<Self, Error> {
-		let csr = pem::parse(pem_str).or(Err(Error::CouldNotParseCertificationRequest))?;
+		let csr = pem::parse(pem_str).map_err(|_| Error::CouldNotParseCertificationRequest)?;
 		Self::from_der(&csr.contents().into())
 	}
 

rcgen/src/lib.rs

@@ -182,7 +182,7 @@ impl SanType {
 	fn from_x509(x509: &x509_parser::certificate::X509Certificate<'_>) -> Result<Vec<Self>, Error> {
 		let sans = x509
 			.subject_alternative_name()
-			.or(Err(Error::CouldNotParseCertificate))?
+			.map_err(|_| Error::CouldNotParseCertificate)?
 			.map(|ext| &ext.value.general_names);
 
 		let Some(sans) = sans else {
@@ -473,7 +473,7 @@ impl KeyUsagePurpose {
 	fn from_x509(x509: &x509_parser::certificate::X509Certificate<'_>) -> Result<Vec<Self>, Error> {
 		let key_usage = x509
 			.key_usage()
-			.or(Err(Error::CouldNotParseCertificate))?
+			.map_err(|_| Error::CouldNotParseCertificate)?
 			.map(|ext| ext.value);
 		// This x509 parser stores flags in reversed bit BIT STRING order
 		let flags = key_usage.map_or(0u16, |k| k.flags).reverse_bits();

rustls-cert-gen/src/cert.rs

@@ -250,8 +250,8 @@ impl KeyPairAlgorithm {
 
 				let rng = ring_like::rand::SystemRandom::new();
 				let alg = &rcgen::PKCS_ED25519;
-				let pkcs8_bytes =
-					Ed25519KeyPair::generate_pkcs8(&rng).or(Err(rcgen::Error::RingUnspecified))?;
+				let pkcs8_bytes = Ed25519KeyPair::generate_pkcs8(&rng)
+					.map_err(|_| rcgen::Error::RingUnspecified)?;
 
 				rcgen::KeyPair::from_pkcs8_der_and_sign_algo(&pkcs8_bytes.as_ref().into(), alg)
 			},
@@ -263,7 +263,7 @@ impl KeyPairAlgorithm {
 				let alg = &rcgen::PKCS_ECDSA_P256_SHA256;
 				let pkcs8_bytes =
 					EcdsaKeyPair::generate_pkcs8(&ECDSA_P256_SHA256_ASN1_SIGNING, &rng)
-						.or(Err(rcgen::Error::RingUnspecified))?;
+						.map_err(|_| rcgen::Error::RingUnspecified)?;
 				rcgen::KeyPair::from_pkcs8_der_and_sign_algo(&pkcs8_bytes.as_ref().into(), alg)
 			},
 			KeyPairAlgorithm::EcdsaP384 => {
@@ -274,7 +274,7 @@ impl KeyPairAlgorithm {
 				let alg = &rcgen::PKCS_ECDSA_P384_SHA384;
 				let pkcs8_bytes =
 					EcdsaKeyPair::generate_pkcs8(&ECDSA_P384_SHA384_ASN1_SIGNING, &rng)
-						.or(Err(rcgen::Error::RingUnspecified))?;
+						.map_err(|_| rcgen::Error::RingUnspecified)?;
 
 				rcgen::KeyPair::from_pkcs8_der_and_sign_algo(&pkcs8_bytes.as_ref().into(), alg)
 			},
@@ -287,7 +287,7 @@ impl KeyPairAlgorithm {
 				let alg = &rcgen::PKCS_ECDSA_P521_SHA512;
 				let pkcs8_bytes =
 					EcdsaKeyPair::generate_pkcs8(&ECDSA_P521_SHA512_ASN1_SIGNING, &rng)
-						.or(Err(rcgen::Error::RingUnspecified))?;
+						.map_err(|_| rcgen::Error::RingUnspecified)?;
 
 				rcgen::KeyPair::from_pkcs8_der_and_sign_algo(&pkcs8_bytes.as_ref().into(), alg)
 			},