Update to PyO3 0.22.

Author: m-ou-se

Cargo.toml

@@ -14,7 +14,7 @@ autoexamples = false
 
 [dependencies]
 inline-python-macros = { version = "=0.12.0", path = "./macros" }
-pyo3 = { version = "0.21", default-features = false, features = ["auto-initialize"] }
+pyo3 = { version = "0.22", default-features = false, features = ["auto-initialize"] }
 
 [workspace]
 members = ["examples", "ct-python"]

examples/Cargo.toml

@@ -17,4 +17,4 @@ path = "rust-fn.rs"
 
 [dependencies]
 inline-python = { path = ".." }
-pyo3 = "0.21"
+pyo3 = "0.22"

macros/Cargo.toml

@@ -16,7 +16,7 @@ proc_macro = true
 [dependencies]
 proc-macro2 = { version = "1.0", features = ["span-locations"] }
 quote = "1.0"
-pyo3 = { version = "0.21", default-features = false, features = ["auto-initialize"] }
+pyo3 = { version = "0.22", default-features = false, features = ["auto-initialize"] }
 
 [target.'cfg(unix)'.dependencies]
 libc = "0.2.71"

src/context.rs

@@ -155,14 +155,14 @@ impl Context {
 	///
 	/// This function temporarily acquires the GIL.
 	/// If you already have the GIL, you can use [`Context::add_wrapped_with_gil`] instead.
-	pub fn add_wrapped(&self, wrapper: &impl Fn(Python) -> PyResult<&PyCFunction>) {
+	pub fn add_wrapped(&self, wrapper: &impl Fn(Python) -> PyResult<Bound<'_, PyCFunction>>) {
 		Python::with_gil(|py| self.add_wrapped_with_gil(py, wrapper));
 	}
 
 	/// Add a wrapped `#[pyfunction]` or `#[pymodule]` using its own `__name__`.
 	///
 	/// See [Context::add_wrapped].
-	pub fn add_wrapped_with_gil<'p>(&self, py: Python<'p>, wrapper: &impl Fn(Python) -> PyResult<&PyCFunction>) {
+	pub fn add_wrapped_with_gil<'p>(&self, py: Python<'p>, wrapper: &impl Fn(Python) -> PyResult<Bound<'_, PyCFunction>>) {
 		let obj = wrapper(py).unwrap();
 		let name = obj.getattr("__name__").expect("Missing __name__");
 		self.set_with_gil(py, name.extract().unwrap(), obj)

src/run.rs

@@ -1,11 +1,11 @@
 use crate::Context;
-use pyo3::{ffi, types::PyAny, PyObject, PyResult, Python};
+use pyo3::{ffi, types::PyAny, Bound, PyObject, PyResult, Python};
 
-pub fn run_python_code<'p>(py: Python<'p>, context: &Context, bytecode: &[u8]) -> PyResult<&'p PyAny> {
+pub fn run_python_code<'p>(py: Python<'p>, context: &Context, bytecode: &[u8]) -> PyResult<Bound<'p, PyAny>> {
 	unsafe {
 		let ptr = ffi::PyMarshal_ReadObjectFromString(bytecode.as_ptr() as *const _, bytecode.len() as isize);
 		let code = PyObject::from_owned_ptr_or_err(py, ptr)?;
 		let result = ffi::PyEval_EvalCode(code.as_ptr(), context.globals.as_ptr(), std::ptr::null_mut());
-		py.from_owned_ptr_or_err(result)
+		Bound::from_owned_ptr_or_err(py, result)
 	}
 }