Update pyo3 (#44)

diceroll123 · Nov 16, 2024 · 1168387 · 1168387
1 parent 190bf02
commit 1168387
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 32 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -8,7 +8,7 @@ name = "neofoodclub"
 crate-type = ["cdylib"]
 
 [dependencies]
-pyo3 = { version = "0.22.6", features = ["extension-module", "abi3-py311", "chrono", "chrono-tz"] }
+pyo3 = { version = "0.23.0", features = ["extension-module", "abi3-py311", "chrono", "chrono-tz"] }
 neofoodclub = { path = "./neofoodclub_rs" }
 chrono = "0.4.38"
 chrono-tz = "0.10.0"

diff --git a/src/arena.rs b/src/arena.rs
@@ -25,10 +25,8 @@ impl Arena {
 
     #[getter]
     fn foods<'a>(&self, py: Python<'a>) -> PyResult<Option<Bound<'a, PyTuple>>> {
-        let elements = &self.inner.foods;
-
-        match elements {
-            Some(foods) => Ok(Some(PyTuple::new_bound(py, foods))),
+        match self.inner.foods {
+            Some(foods) => Ok(Some(PyTuple::new(py, foods)?)),
             None => Ok(None),
         }
     }
@@ -55,7 +53,7 @@ impl Arena {
     #[getter]
     fn pirate_ids<'a>(&self, py: Python<'a>) -> PyResult<Bound<'a, PyTuple>> {
         let elements = &self.inner.ids();
-        Ok(PyTuple::new_bound(py, elements))
+        PyTuple::new(py, elements)
     }
 
     #[getter]
@@ -180,7 +178,7 @@ impl Arenas {
             .iter()
             .map(|a| a.pirate_ids(py).expect("failed to get pirate ids"))
             .collect();
-        Ok(PyTuple::new_bound(py, elements))
+        PyTuple::new(py, elements)
     }
 
     #[getter]

diff --git a/src/bets.rs b/src/bets.rs
@@ -25,7 +25,7 @@ impl Bets {
         let elements = &self.inner.bet_amounts;
 
         match elements {
-            Some(amounts) => Ok(Some(PyTuple::new_bound(py, amounts))),
+            Some(amounts) => Ok(Some(PyTuple::new(py, amounts)?)),
             None => Ok(None),
         }
     }
@@ -60,7 +60,7 @@ impl Bets {
 
     #[getter]
     fn binaries<'a>(&self, py: Python<'a>) -> PyResult<Bound<'a, PyTuple>> {
-        Ok(PyTuple::new_bound(py, self.inner.get_binaries()))
+        PyTuple::new(py, self.inner.get_binaries())
     }
 
     #[getter]
@@ -104,12 +104,12 @@ impl Bets {
     #[getter]
     fn indices<'a>(&self, py: Python<'a>) -> PyResult<Bound<'a, PyTuple>> {
         let indicies = self.inner.get_indices();
-        let py_indicies: Vec<Bound<'a, PyTuple>> = indicies
+        let py_indicies: Result<Vec<Bound<'a, PyTuple>>, PyErr> = indicies
             .iter()
-            .map(|index| PyTuple::new_bound(py, index))
+            .map(|index| PyTuple::new(py, index))
             .collect();
 
-        Ok(PyTuple::new_bound(py, py_indicies))
+        PyTuple::new(py, py_indicies?)
     }
 
     fn net_expected(&self, nfc: &NeoFoodClub) -> f64 {

diff --git a/src/math.rs b/src/math.rs
@@ -31,7 +31,7 @@ impl Math {
     #[staticmethod]
     fn binary_to_indices(py: Python<'_>, binary: u32) -> PyResult<Bound<'_, PyTuple>> {
         let elements = neofoodclub::math::binary_to_indices(binary);
-        Ok(PyTuple::new_bound(py, elements))
+        PyTuple::new(py, elements)
     }
 
     #[staticmethod]
@@ -40,7 +40,7 @@ impl Math {
         bets_hash: &'a str,
     ) -> PyResult<Bound<'a, PyTuple>> {
         let elements = neofoodclub::math::bets_hash_to_bet_indices(bets_hash);
-        Ok(PyTuple::new_bound(py, elements))
+        PyTuple::new(py, elements)
     }
 
     #[staticmethod]
@@ -59,7 +59,7 @@ impl Math {
         amounts_hash: &'a str,
     ) -> PyResult<Bound<'a, PyTuple>> {
         let elements = neofoodclub::math::amounts_hash_to_bet_amounts(amounts_hash);
-        Ok(PyTuple::new_bound(py, elements))
+        PyTuple::new(py, elements)
     }
 
     #[staticmethod]
@@ -68,7 +68,7 @@ impl Math {
         bets_hash: &'a str,
     ) -> PyResult<Bound<'a, PyTuple>> {
         let elements = neofoodclub::math::bets_hash_to_bet_binaries(bets_hash);
-        Ok(PyTuple::new_bound(py, elements))
+        PyTuple::new(py, elements)
     }
 
     #[staticmethod]
@@ -82,7 +82,7 @@ impl Math {
         bets_indices: Vec<[u8; 5]>,
     ) -> PyResult<Bound<'_, PyTuple>> {
         let elements = neofoodclub::math::bets_indices_to_bet_binaries(bets_indices);
-        Ok(PyTuple::new_bound(py, elements))
+        PyTuple::new(py, elements)
     }
 
     #[staticmethod]
@@ -92,13 +92,12 @@ impl Math {
         bet_odds: Vec<u32>,
         probabilities: [[f64; 5]; 5],
     ) -> PyResult<Bound<'_, PyTuple>> {
-        let py_structs: Vec<PyObject> =
-            neofoodclub::math::build_chance_objects(&bets, &bet_odds, probabilities)
-                .into_iter()
-                .map(|chance| Chance::from(chance).into_py(py))
-                .collect();
+        let py_structs = neofoodclub::math::build_chance_objects(&bets, &bet_odds, probabilities)
+            .into_iter()
+            .map(|chance| Chance::from(chance).into_pyobject(py))
+            .collect::<Result<Vec<_>, _>>()?;
 
-        Ok(PyTuple::new_bound(py, py_structs))
+        PyTuple::new(py, py_structs)
     }
 
     #[staticmethod]

diff --git a/src/nfc.rs b/src/nfc.rs
@@ -19,6 +19,8 @@ pub struct NeoFoodClub {
     pub inner: neofoodclub::nfc::NeoFoodClub,
 }
 
+unsafe impl Sync for NeoFoodClub {}
+
 fn convert_probability_model_int_to_enum(
     probability_model: Option<u8>,
 ) -> Option<neofoodclub::nfc::ProbabilityModel> {
@@ -132,7 +134,7 @@ impl NeoFoodClub {
     #[getter]
     fn winners<'a>(&self, py: Python<'a>) -> PyResult<Bound<'a, PyTuple>> {
         let elements = self.inner.winners();
-        Ok(PyTuple::new_bound(py, elements))
+        PyTuple::new(py, elements)
     }
 
     #[getter]
@@ -163,25 +165,25 @@ impl NeoFoodClub {
     #[getter]
     fn current_odds<'a>(&self, py: Python<'a>) -> PyResult<Bound<'a, PyTuple>> {
         let elements = self.inner.current_odds();
-        Ok(PyTuple::new_bound(py, elements))
+        PyTuple::new(py, elements)
     }
 
     #[getter]
     fn custom_odds<'a>(&self, py: Python<'a>) -> PyResult<Bound<'a, PyTuple>> {
         let elements = self.inner.custom_odds();
-        Ok(PyTuple::new_bound(py, elements))
+        PyTuple::new(py, elements)
     }
 
     #[getter]
     fn opening_odds<'a>(&self, py: Python<'a>) -> PyResult<Bound<'a, PyTuple>> {
         let elements = self.inner.opening_odds();
-        Ok(PyTuple::new_bound(py, elements))
+        PyTuple::new(py, elements)
     }
 
     #[getter]
     fn pirates<'a>(&self, py: Python<'a>) -> PyResult<Bound<'a, PyTuple>> {
         let elements = self.inner.pirates();
-        Ok(PyTuple::new_bound(py, elements))
+        PyTuple::new(py, elements)
     }
 
     #[getter]
@@ -212,7 +214,7 @@ impl NeoFoodClub {
         let elements = self.inner.foods();
 
         match elements {
-            Some(e) => Ok(Some(PyTuple::new_bound(py, e))),
+            Some(e) => Ok(Some(PyTuple::new(py, e)?)),
             None => Ok(None),
         }
     }

diff --git a/src/pirates.rs b/src/pirates.rs
@@ -143,7 +143,7 @@ impl Pirate {
         let elements = self.inner.positive_foods(&nfc.inner);
 
         match elements {
-            Some(foods) => Ok(Some(PyTuple::new_bound(py, foods))),
+            Some(foods) => Ok(Some(PyTuple::new(py, foods)?)),
             None => Ok(None),
         }
     }
@@ -156,7 +156,7 @@ impl Pirate {
         let elements = self.inner.negative_foods(&nfc.inner);
 
         match elements {
-            Some(foods) => Ok(Some(PyTuple::new_bound(py, foods))),
+            Some(foods) => Ok(Some(PyTuple::new(py, foods)?)),
             None => Ok(None),
         }
     }

diff --git a/uv.lock b/uv.lock