Use pyo3's add_function instead of add_wrapped (#8913)

Turns out the docs encourage this.

14 files changed, 52 insertions, 52 deletions

diff --git a/src/rust/src/asn1.rs b/src/rust/src/asn1.rs
index 96e44e93a..bf17a5952 100644
--- a/src/rust/src/asn1.rs
+++ b/src/rust/src/asn1.rs
@@ -180,12 +180,12 @@ fn test_parse_certificate(data: &[u8]) -> Result<TestCertificate, CryptographyEr
 
 pub(crate) fn create_submodule(py: pyo3::Python<'_>) -> pyo3::PyResult<&pyo3::prelude::PyModule> {
     let submod = pyo3::prelude::PyModule::new(py, "asn1")?;
-    submod.add_wrapped(pyo3::wrap_pyfunction!(parse_spki_for_data))?;
+    submod.add_function(pyo3::wrap_pyfunction!(parse_spki_for_data, submod)?)?;
 
-    submod.add_wrapped(pyo3::wrap_pyfunction!(decode_dss_signature))?;
-    submod.add_wrapped(pyo3::wrap_pyfunction!(encode_dss_signature))?;
+    submod.add_function(pyo3::wrap_pyfunction!(decode_dss_signature, submod)?)?;
+    submod.add_function(pyo3::wrap_pyfunction!(encode_dss_signature, submod)?)?;
 
-    submod.add_wrapped(pyo3::wrap_pyfunction!(test_parse_certificate))?;
+    submod.add_function(pyo3::wrap_pyfunction!(test_parse_certificate, submod)?)?;
 
     Ok(submod)
 }
diff --git a/src/rust/src/backend/dh.rs b/src/rust/src/backend/dh.rs
index 2daff9dcb..b4dbaf5dd 100644
--- a/src/rust/src/backend/dh.rs
+++ b/src/rust/src/backend/dh.rs
@@ -418,14 +418,14 @@ impl DHParameters {
 
 pub(crate) fn create_module(py: pyo3::Python<'_>) -> pyo3::PyResult<&pyo3::prelude::PyModule> {
     let m = pyo3::prelude::PyModule::new(py, "dh")?;
-    m.add_wrapped(pyo3::wrap_pyfunction!(generate_parameters))?;
-    m.add_wrapped(pyo3::wrap_pyfunction!(private_key_from_ptr))?;
-    m.add_wrapped(pyo3::wrap_pyfunction!(public_key_from_ptr))?;
-    m.add_wrapped(pyo3::wrap_pyfunction!(from_der_parameters))?;
-    m.add_wrapped(pyo3::wrap_pyfunction!(from_pem_parameters))?;
-    m.add_wrapped(pyo3::wrap_pyfunction!(from_private_numbers))?;
-    m.add_wrapped(pyo3::wrap_pyfunction!(from_public_numbers))?;
-    m.add_wrapped(pyo3::wrap_pyfunction!(from_parameter_numbers))?;
+    m.add_function(pyo3::wrap_pyfunction!(generate_parameters, m)?)?;
+    m.add_function(pyo3::wrap_pyfunction!(private_key_from_ptr, m)?)?;
+    m.add_function(pyo3::wrap_pyfunction!(public_key_from_ptr, m)?)?;
+    m.add_function(pyo3::wrap_pyfunction!(from_der_parameters, m)?)?;
+    m.add_function(pyo3::wrap_pyfunction!(from_pem_parameters, m)?)?;
+    m.add_function(pyo3::wrap_pyfunction!(from_private_numbers, m)?)?;
+    m.add_function(pyo3::wrap_pyfunction!(from_public_numbers, m)?)?;
+    m.add_function(pyo3::wrap_pyfunction!(from_parameter_numbers, m)?)?;
 
     m.add_class::<DHPrivateKey>()?;
     m.add_class::<DHPublicKey>()?;
diff --git a/src/rust/src/backend/ed25519.rs b/src/rust/src/backend/ed25519.rs
index f10d12db2..8cad193c7 100644
--- a/src/rust/src/backend/ed25519.rs
+++ b/src/rust/src/backend/ed25519.rs
@@ -163,11 +163,11 @@ impl Ed25519PublicKey {
 
 pub(crate) fn create_module(py: pyo3::Python<'_>) -> pyo3::PyResult<&pyo3::prelude::PyModule> {
     let m = pyo3::prelude::PyModule::new(py, "ed25519")?;
-    m.add_wrapped(pyo3::wrap_pyfunction!(generate_key))?;
-    m.add_wrapped(pyo3::wrap_pyfunction!(private_key_from_ptr))?;
-    m.add_wrapped(pyo3::wrap_pyfunction!(public_key_from_ptr))?;
-    m.add_wrapped(pyo3::wrap_pyfunction!(from_private_bytes))?;
-    m.add_wrapped(pyo3::wrap_pyfunction!(from_public_bytes))?;
+    m.add_function(pyo3::wrap_pyfunction!(generate_key, m)?)?;
+    m.add_function(pyo3::wrap_pyfunction!(private_key_from_ptr, m)?)?;
+    m.add_function(pyo3::wrap_pyfunction!(public_key_from_ptr, m)?)?;
+    m.add_function(pyo3::wrap_pyfunction!(from_private_bytes, m)?)?;
+    m.add_function(pyo3::wrap_pyfunction!(from_public_bytes, m)?)?;
 
     m.add_class::<Ed25519PrivateKey>()?;
     m.add_class::<Ed25519PublicKey>()?;
diff --git a/src/rust/src/backend/ed448.rs b/src/rust/src/backend/ed448.rs
index 44e0240a1..925a9fdb1 100644
--- a/src/rust/src/backend/ed448.rs
+++ b/src/rust/src/backend/ed448.rs
@@ -161,11 +161,11 @@ impl Ed448PublicKey {
 
 pub(crate) fn create_module(py: pyo3::Python<'_>) -> pyo3::PyResult<&pyo3::prelude::PyModule> {
     let m = pyo3::prelude::PyModule::new(py, "ed448")?;
-    m.add_wrapped(pyo3::wrap_pyfunction!(generate_key))?;
-    m.add_wrapped(pyo3::wrap_pyfunction!(private_key_from_ptr))?;
-    m.add_wrapped(pyo3::wrap_pyfunction!(public_key_from_ptr))?;
-    m.add_wrapped(pyo3::wrap_pyfunction!(from_private_bytes))?;
-    m.add_wrapped(pyo3::wrap_pyfunction!(from_public_bytes))?;
+    m.add_function(pyo3::wrap_pyfunction!(generate_key, m)?)?;
+    m.add_function(pyo3::wrap_pyfunction!(private_key_from_ptr, m)?)?;
+    m.add_function(pyo3::wrap_pyfunction!(public_key_from_ptr, m)?)?;
+    m.add_function(pyo3::wrap_pyfunction!(from_private_bytes, m)?)?;
+    m.add_function(pyo3::wrap_pyfunction!(from_public_bytes, m)?)?;
 
     m.add_class::<Ed448PrivateKey>()?;
     m.add_class::<Ed448PublicKey>()?;
diff --git a/src/rust/src/backend/kdf.rs b/src/rust/src/backend/kdf.rs
index 5bd5606c9..de527f467 100644
--- a/src/rust/src/backend/kdf.rs
+++ b/src/rust/src/backend/kdf.rs
@@ -52,9 +52,9 @@ fn derive_scrypt<'p>(
 pub(crate) fn create_module(py: pyo3::Python<'_>) -> pyo3::PyResult<&pyo3::prelude::PyModule> {
     let m = pyo3::prelude::PyModule::new(py, "kdf")?;
 
-    m.add_wrapped(pyo3::wrap_pyfunction!(derive_pbkdf2_hmac))?;
+    m.add_function(pyo3::wrap_pyfunction!(derive_pbkdf2_hmac, m)?)?;
     #[cfg(not(CRYPTOGRAPHY_IS_LIBRESSL))]
-    m.add_wrapped(pyo3::wrap_pyfunction!(derive_scrypt))?;
+    m.add_function(pyo3::wrap_pyfunction!(derive_scrypt, m)?)?;
 
     Ok(m)
 }
diff --git a/src/rust/src/backend/x25519.rs b/src/rust/src/backend/x25519.rs
index 0a62182b1..faf21ffdd 100644
--- a/src/rust/src/backend/x25519.rs
+++ b/src/rust/src/backend/x25519.rs
@@ -152,11 +152,11 @@ impl X25519PublicKey {
 
 pub(crate) fn create_module(py: pyo3::Python<'_>) -> pyo3::PyResult<&pyo3::prelude::PyModule> {
     let m = pyo3::prelude::PyModule::new(py, "x25519")?;
-    m.add_wrapped(pyo3::wrap_pyfunction!(generate_key))?;
-    m.add_wrapped(pyo3::wrap_pyfunction!(private_key_from_ptr))?;
-    m.add_wrapped(pyo3::wrap_pyfunction!(public_key_from_ptr))?;
-    m.add_wrapped(pyo3::wrap_pyfunction!(from_private_bytes))?;
-    m.add_wrapped(pyo3::wrap_pyfunction!(from_public_bytes))?;
+    m.add_function(pyo3::wrap_pyfunction!(generate_key, m)?)?;
+    m.add_function(pyo3::wrap_pyfunction!(private_key_from_ptr, m)?)?;
+    m.add_function(pyo3::wrap_pyfunction!(public_key_from_ptr, m)?)?;
+    m.add_function(pyo3::wrap_pyfunction!(from_private_bytes, m)?)?;
+    m.add_function(pyo3::wrap_pyfunction!(from_public_bytes, m)?)?;
 
     m.add_class::<X25519PrivateKey>()?;
     m.add_class::<X25519PublicKey>()?;
diff --git a/src/rust/src/backend/x448.rs b/src/rust/src/backend/x448.rs
index 0eb44b8fe..456e7fa52 100644
--- a/src/rust/src/backend/x448.rs
+++ b/src/rust/src/backend/x448.rs
@@ -151,11 +151,11 @@ impl X448PublicKey {
 
 pub(crate) fn create_module(py: pyo3::Python<'_>) -> pyo3::PyResult<&pyo3::prelude::PyModule> {
     let m = pyo3::prelude::PyModule::new(py, "x448")?;
-    m.add_wrapped(pyo3::wrap_pyfunction!(generate_key))?;
-    m.add_wrapped(pyo3::wrap_pyfunction!(private_key_from_ptr))?;
-    m.add_wrapped(pyo3::wrap_pyfunction!(public_key_from_ptr))?;
-    m.add_wrapped(pyo3::wrap_pyfunction!(from_private_bytes))?;
-    m.add_wrapped(pyo3::wrap_pyfunction!(from_public_bytes))?;
+    m.add_function(pyo3::wrap_pyfunction!(generate_key, m)?)?;
+    m.add_function(pyo3::wrap_pyfunction!(private_key_from_ptr, m)?)?;
+    m.add_function(pyo3::wrap_pyfunction!(public_key_from_ptr, m)?)?;
+    m.add_function(pyo3::wrap_pyfunction!(from_private_bytes, m)?)?;
+    m.add_function(pyo3::wrap_pyfunction!(from_public_bytes, m)?)?;
 
     m.add_class::<X448PrivateKey>()?;
     m.add_class::<X448PublicKey>()?;
diff --git a/src/rust/src/pkcs7.rs b/src/rust/src/pkcs7.rs
index 17a83fd16..6a49acf98 100644
--- a/src/rust/src/pkcs7.rs
+++ b/src/rust/src/pkcs7.rs
@@ -316,8 +316,8 @@ fn smime_canonicalize(data: &[u8], text_mode: bool) -> (Cow<'_, [u8]>, Cow<'_, [
 pub(crate) fn create_submodule(py: pyo3::Python<'_>) -> pyo3::PyResult<&pyo3::prelude::PyModule> {
     let submod = pyo3::prelude::PyModule::new(py, "pkcs7")?;
 
-    submod.add_wrapped(pyo3::wrap_pyfunction!(serialize_certificates))?;
-    submod.add_wrapped(pyo3::wrap_pyfunction!(sign_and_serialize))?;
+    submod.add_function(pyo3::wrap_pyfunction!(serialize_certificates, submod)?)?;
+    submod.add_function(pyo3::wrap_pyfunction!(sign_and_serialize, submod)?)?;
 
     Ok(submod)
 }
diff --git a/src/rust/src/x509/certificate.rs b/src/rust/src/x509/certificate.rs
index f77f141fa..92ef6c967 100644
--- a/src/rust/src/x509/certificate.rs
+++ b/src/rust/src/x509/certificate.rs
@@ -1077,10 +1077,10 @@ pub(crate) fn set_bit(vals: &mut [u8], n: usize, set: bool) {
 }
 
 pub(crate) fn add_to_module(module: &pyo3::prelude::PyModule) -> pyo3::PyResult<()> {
-    module.add_wrapped(pyo3::wrap_pyfunction!(load_der_x509_certificate))?;
-    module.add_wrapped(pyo3::wrap_pyfunction!(load_pem_x509_certificate))?;
-    module.add_wrapped(pyo3::wrap_pyfunction!(load_pem_x509_certificates))?;
-    module.add_wrapped(pyo3::wrap_pyfunction!(create_x509_certificate))?;
+    module.add_function(pyo3::wrap_pyfunction!(load_der_x509_certificate, module)?)?;
+    module.add_function(pyo3::wrap_pyfunction!(load_pem_x509_certificate, module)?)?;
+    module.add_function(pyo3::wrap_pyfunction!(load_pem_x509_certificates, module)?)?;
+    module.add_function(pyo3::wrap_pyfunction!(create_x509_certificate, module)?)?;
 
     module.add_class::<Certificate>()?;
 
diff --git a/src/rust/src/x509/common.rs b/src/rust/src/x509/common.rs
index 3c42f0c5d..bc26dace3 100644
--- a/src/rust/src/x509/common.rs
+++ b/src/rust/src/x509/common.rs
@@ -555,8 +555,8 @@ pub(crate) fn datetime_now(py: pyo3::Python<'_>) -> pyo3::PyResult<asn1::DateTim
 }
 
 pub(crate) fn add_to_module(module: &pyo3::prelude::PyModule) -> pyo3::PyResult<()> {
-    module.add_wrapped(pyo3::wrap_pyfunction!(encode_extension_value))?;
-    module.add_wrapped(pyo3::wrap_pyfunction!(encode_name_bytes))?;
+    module.add_function(pyo3::wrap_pyfunction!(encode_extension_value, module)?)?;
+    module.add_function(pyo3::wrap_pyfunction!(encode_name_bytes, module)?)?;
 
     Ok(())
 }
diff --git a/src/rust/src/x509/crl.rs b/src/rust/src/x509/crl.rs
index 1331d3377..9dc63aa8d 100644
--- a/src/rust/src/x509/crl.rs
+++ b/src/rust/src/x509/crl.rs
@@ -648,9 +648,9 @@ fn create_x509_crl(
 }
 
 pub(crate) fn add_to_module(module: &pyo3::prelude::PyModule) -> pyo3::PyResult<()> {
-    module.add_wrapped(pyo3::wrap_pyfunction!(load_der_x509_crl))?;
-    module.add_wrapped(pyo3::wrap_pyfunction!(load_pem_x509_crl))?;
-    module.add_wrapped(pyo3::wrap_pyfunction!(create_x509_crl))?;
+    module.add_function(pyo3::wrap_pyfunction!(load_der_x509_crl, module)?)?;
+    module.add_function(pyo3::wrap_pyfunction!(load_pem_x509_crl, module)?)?;
+    module.add_function(pyo3::wrap_pyfunction!(create_x509_crl, module)?)?;
 
     module.add_class::<CertificateRevocationList>()?;
     module.add_class::<RevokedCertificate>()?;
diff --git a/src/rust/src/x509/csr.rs b/src/rust/src/x509/csr.rs
index 110acf3a1..28ec67ed2 100644
--- a/src/rust/src/x509/csr.rs
+++ b/src/rust/src/x509/csr.rs
@@ -385,9 +385,9 @@ fn create_x509_csr(
 }
 
 pub(crate) fn add_to_module(module: &pyo3::prelude::PyModule) -> pyo3::PyResult<()> {
-    module.add_wrapped(pyo3::wrap_pyfunction!(load_der_x509_csr))?;
-    module.add_wrapped(pyo3::wrap_pyfunction!(load_pem_x509_csr))?;
-    module.add_wrapped(pyo3::wrap_pyfunction!(create_x509_csr))?;
+    module.add_function(pyo3::wrap_pyfunction!(load_der_x509_csr, module)?)?;
+    module.add_function(pyo3::wrap_pyfunction!(load_pem_x509_csr, module)?)?;
+    module.add_function(pyo3::wrap_pyfunction!(create_x509_csr, module)?)?;
 
     module.add_class::<CertificateSigningRequest>()?;
 
diff --git a/src/rust/src/x509/ocsp_req.rs b/src/rust/src/x509/ocsp_req.rs
index bd5aecad0..1571524ed 100644
--- a/src/rust/src/x509/ocsp_req.rs
+++ b/src/rust/src/x509/ocsp_req.rs
@@ -239,8 +239,8 @@ fn create_ocsp_request(
 }
 
 pub(crate) fn add_to_module(module: &pyo3::prelude::PyModule) -> pyo3::PyResult<()> {
-    module.add_wrapped(pyo3::wrap_pyfunction!(load_der_ocsp_request))?;
-    module.add_wrapped(pyo3::wrap_pyfunction!(create_ocsp_request))?;
+    module.add_function(pyo3::wrap_pyfunction!(load_der_ocsp_request, module)?)?;
+    module.add_function(pyo3::wrap_pyfunction!(create_ocsp_request, module)?)?;
 
     Ok(())
 }
diff --git a/src/rust/src/x509/ocsp_resp.rs b/src/rust/src/x509/ocsp_resp.rs
index f2a86241e..721e0313a 100644
--- a/src/rust/src/x509/ocsp_resp.rs
+++ b/src/rust/src/x509/ocsp_resp.rs
@@ -738,8 +738,8 @@ fn create_ocsp_response(
 }
 
 pub(crate) fn add_to_module(module: &pyo3::prelude::PyModule) -> pyo3::PyResult<()> {
-    module.add_wrapped(pyo3::wrap_pyfunction!(load_der_ocsp_response))?;
-    module.add_wrapped(pyo3::wrap_pyfunction!(create_ocsp_response))?;
+    module.add_function(pyo3::wrap_pyfunction!(load_der_ocsp_response, module)?)?;
+    module.add_function(pyo3::wrap_pyfunction!(create_ocsp_response, module)?)?;
 
     Ok(())
 }