Consistently use wrap_pyfunction_bound (#10821)

pyca · Apr 15, 2024 · ce03d92 · ce03d92
1 parent 1945701
commit ce03d92
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/src/rust/src/backend/ciphers.rs b/src/rust/src/backend/ciphers.rs
@@ -559,12 +559,12 @@ pub(crate) fn create_module(
     py: pyo3::Python<'_>,
 ) -> pyo3::PyResult<pyo3::Bound<'_, pyo3::prelude::PyModule>> {
     let m = pyo3::prelude::PyModule::new_bound(py, "ciphers")?;
-    m.add_function(pyo3::wrap_pyfunction!(create_encryption_ctx, &m)?)?;
-    m.add_function(pyo3::wrap_pyfunction!(create_decryption_ctx, &m)?)?;
-    m.add_function(pyo3::wrap_pyfunction!(cipher_supported, &m)?)?;
+    m.add_function(pyo3::wrap_pyfunction_bound!(create_encryption_ctx, &m)?)?;
+    m.add_function(pyo3::wrap_pyfunction_bound!(create_decryption_ctx, &m)?)?;
+    m.add_function(pyo3::wrap_pyfunction_bound!(cipher_supported, &m)?)?;
 
-    m.add_function(pyo3::wrap_pyfunction!(_advance, &m)?)?;
-    m.add_function(pyo3::wrap_pyfunction!(_advance_aad, &m)?)?;
+    m.add_function(pyo3::wrap_pyfunction_bound!(_advance, &m)?)?;
+    m.add_function(pyo3::wrap_pyfunction_bound!(_advance_aad, &m)?)?;
 
     m.add_class::<PyCipherContext>()?;
     m.add_class::<PyAEADEncryptionContext>()?;

diff --git a/src/rust/src/backend/rsa.rs b/src/rust/src/backend/rsa.rs
@@ -817,7 +817,7 @@ pub(crate) fn create_module(
     py: pyo3::Python<'_>,
 ) -> pyo3::PyResult<pyo3::Bound<'_, pyo3::prelude::PyModule>> {
     let m = pyo3::prelude::PyModule::new_bound(py, "rsa")?;
-    m.add_function(pyo3::wrap_pyfunction!(generate_private_key, &m)?)?;
+    m.add_function(pyo3::wrap_pyfunction_bound!(generate_private_key, &m)?)?;
 
     m.add_class::<RsaPrivateKey>()?;
     m.add_class::<RsaPublicKey>()?;

diff --git a/src/rust/src/pkcs12.rs b/src/rust/src/pkcs12.rs
@@ -318,8 +318,11 @@ pub(crate) fn create_submodule(
 ) -> pyo3::PyResult<pyo3::Bound<'_, pyo3::prelude::PyModule>> {
     let submod = pyo3::prelude::PyModule::new_bound(py, "pkcs12")?;
 
-    submod.add_function(pyo3::wrap_pyfunction!(load_key_and_certificates, &submod)?)?;
-    submod.add_function(pyo3::wrap_pyfunction!(load_pkcs12, &submod)?)?;
+    submod.add_function(pyo3::wrap_pyfunction_bound!(
+        load_key_and_certificates,
+        &submod
+    )?)?;
+    submod.add_function(pyo3::wrap_pyfunction_bound!(load_pkcs12, &submod)?)?;
 
     submod.add_class::<PKCS12Certificate>()?;