Linting.

Author: sephynox

src/lib/asn1/utils.rs

@@ -47,13 +47,13 @@ pub fn parse_oid_string<S: AsRef<str>>(oid_str: S) -> Result<ObjectIdentifier, A
 	let arcs: Result<Vec<u32>, _> = oid_str.split('.').map(|s| s.parse::<u32>()).collect();
 	let arcs = match arcs {
 		Ok(arcs) => arcs,
-		Err(e) => return Err(Asn1Error::InvalidOid { message: format!("Failed to parse OID '{}': {}", oid_str, e) }),
+		Err(e) => return Err(Asn1Error::InvalidOid { message: format!("Failed to parse OID '{oid_str}': {e}") }),
 	};
 
 	// Create ObjectIdentifier from arcs
 	match ObjectIdentifier::new(arcs) {
 		Some(oid) => Ok(oid),
-		None => Err(Asn1Error::InvalidOid { message: format!("Failed to create ObjectIdentifier from '{}'", oid_str) }),
+		None => Err(Asn1Error::InvalidOid { message: format!("Failed to create ObjectIdentifier from '{oid_str}'") }),
 	}
 }
 

src/lib/certificates/builder.rs

@@ -182,14 +182,14 @@ impl CertificateBuilder {
 				let sensitive_der = rasn::der::encode(&sensitive_attr)?;
 
 				AttributeBuilder::new()
-					.with_oid(&oid.to_string())
+					.with_oid(oid.to_string())
 					.with_value(sensitive_der)
 					.as_sensitive()
 					.build()?
 			} else {
 				// Create a plain attribute
 				AttributeBuilder::new()
-					.with_oid(&oid.to_string())
+					.with_oid(oid.to_string())
 					.with_value(&entry.value)
 					.as_plain()
 					.build()?
@@ -202,7 +202,7 @@ impl CertificateBuilder {
 		let kyc_der = rasn::der::encode(&kyc_attributes)?;
 
 		// Create the extension
-		Ok(Extension::new(&KYC_ATTRIBUTES_EXTENSION_OID.to_string(), kyc_der, false)?)
+		Ok(Extension::new(KYC_ATTRIBUTES_EXTENSION_OID.to_string(), kyc_der, false)?)
 	}
 }
 
@@ -294,7 +294,7 @@ impl Certificate {
 	/// Parse KYC attributes from an X.509 certificate
 	fn parse_kyc_attributes(x509_cert: &X509Certificate) -> KYCAttributes {
 		// Try to find the KYC attributes extension
-		if let Some(extension) = x509_cert.get_extension(&KYC_ATTRIBUTES_EXTENSION_OID.to_string()) {
+		if let Some(extension) = x509_cert.get_extension(KYC_ATTRIBUTES_EXTENSION_OID.to_string()) {
 			// Try to decode the extension value
 			if let Ok(kyc_attrs) = rasn::der::decode::<KYCAttributes>(extension.value.as_bytes()) {
 				return kyc_attrs;
@@ -361,7 +361,7 @@ mod tests {
 		];
 
 		for (name, builder) in builders {
-			assert!(builder.kyc_attributes.is_empty(), "Builder {} should have empty attributes", name);
+			assert!(builder.kyc_attributes.is_empty(), "Builder {name} should have empty attributes");
 		}
 	}
 
@@ -429,7 +429,7 @@ mod tests {
 		let x509_cert = cert.to_x509();
 		// Just check that we can access the X509 certificate
 		assert!(x509_cert
-			.get_extension(&KYC_ATTRIBUTES_EXTENSION_OID.to_string())
+			.get_extension(KYC_ATTRIBUTES_EXTENSION_OID.to_string())
 			.is_none());
 
 		// Test Certificate.kyc_attributes
@@ -445,10 +445,10 @@ mod tests {
 		assert!(matches!(result.unwrap_err(), CertificateError::AttributeNotFound { .. }));
 	}
 
-	fn test_certificate_building_functionality<T: KeyPair, S>(account: Account<T>)
+	fn test_certificate_building_functionality<T, S>(account: Account<T>)
 	where
 		Account<T>: TryFrom<accounts::Accountable<T>, Error = accounts::AccountError>,
-		T: CryptoSignerWithOptions<S> + 'static,
+		T: KeyPair + CryptoSignerWithOptions<S> + 'static,
 		S: SignatureEncoding,
 	{
 		let subject_dn = x509::utils::create_dn(&[(x509::oids::CN, "Test Subject")]).unwrap();
@@ -498,10 +498,10 @@ mod tests {
 
 	crate::test_all_key_types!(test_certificate_building, test_certificate_building_functionality);
 
-	fn test_certificate_attribute_type_errors<T: KeyPair, S>(account: Account<T>)
+	fn test_certificate_attribute_type_errors<T, S>(account: Account<T>)
 	where
 		Account<T>: TryFrom<accounts::Accountable<T>, Error = accounts::AccountError>,
-		T: CryptoSignerWithOptions<S> + 'static,
+		T: KeyPair + CryptoSignerWithOptions<S> + 'static,
 		S: SignatureEncoding,
 	{
 		let subject_dn = x509::utils::create_dn(&[(x509::oids::CN, "Test Subject")]).unwrap();

src/lib/certificates/utils.rs

@@ -0,0 +1 @@
+

src/lib/kyc_schema/builder.rs

@@ -49,8 +49,8 @@ impl AttributeBuilder {
 	/// Build the attribute
 	pub fn build(self) -> Result<Attribute, KycSchemaError> {
 		// Validate and extract OID and value
-		let oid_str = self.name_oid.ok_or_else(|| KycSchemaError::MissingOid)?;
-		let value_bytes = self.value.ok_or_else(|| KycSchemaError::MissingValue)?;
+		let oid_str = self.name_oid.ok_or(KycSchemaError::MissingOid)?;
+		let value_bytes = self.value.ok_or(KycSchemaError::MissingValue)?;
 		// Parse OID string using utility function
 		let oid = parse_oid_string(&oid_str)?;
 		let octet_string = OctetString::from_slice(&value_bytes);

src/lib/kyc_schema/mod.rs

@@ -209,7 +209,7 @@ mod tests {
 
 	fn build_attribute(test_attr: &TestAttribute) -> Attribute {
 		let builder = AttributeBuilder::new()
-			.with_oid(&test_attr.oid.to_string())
+			.with_oid(test_attr.oid.to_string())
 			.with_value(test_attr.value);
 
 		if test_attr.is_sensitive {
@@ -252,7 +252,7 @@ mod tests {
 		}
 
 		// Test non-existent OID
-		assert!(attributes.find_by_oid("1.2.3.4.5".to_string()).is_none());
+		assert!(attributes.find_by_oid("1.2.3.4.5").is_none());
 	}
 
 	#[test]
@@ -320,10 +320,7 @@ mod tests {
 
 	#[test]
 	fn test_from_iterator() {
-		let attrs: Vec<Attribute> = TEST_ATTRIBUTES
-			.iter()
-			.map(|test_attr| build_attribute(test_attr))
-			.collect();
+		let attrs: Vec<Attribute> = TEST_ATTRIBUTES.iter().map(build_attribute).collect();
 
 		let kyc_attrs: KYCAttributes = attrs.into_iter().collect();
 		assert_eq!(kyc_attrs.count(), TEST_ATTRIBUTES.len());

src/lib/utils.rs

@@ -42,15 +42,16 @@ macro_rules! impl_source_error_from {
 /// # Example
 /// ```rust
 /// use anchor_rs::impl_source_error_from_via;
+/// use anchor_rs::asn1::error::Asn1Error;
 ///
 /// #[derive(Debug)]
 /// enum MyError {
-///     Asn1Error { source: crate::asn1::error::Asn1Error },
+///     Asn1Error { source: Asn1Error },
 /// }
 ///
 /// impl_source_error_from_via!(MyError, {
-///     rasn::error::EncodeError => Asn1Error via crate::asn1::error::Asn1Error,
-///     rasn::error::DecodeError => Asn1Error via crate::asn1::error::Asn1Error,
+///     rasn::error::EncodeError => Asn1Error via Asn1Error,
+///     rasn::error::DecodeError => Asn1Error via Asn1Error,
 /// });
 /// ```
 #[macro_export]