wip test PyO3 HEAD

Author: davidhewitt

Cargo.lock

@@ -29,7 +29,7 @@ rust-version = "1.75"
 [dependencies]
 # TODO it would be very nice to remove the "py-clone" feature as it can panic,
 # but needs a bit of work to make sure it's not used in the codebase
-pyo3 = { version = "0.22.2", features = ["generate-import-lib", "num-bigint", "py-clone"] }
+pyo3 = { git = "https://github.com/pyo3/pyo3", features = ["generate-import-lib", "num-bigint", "py-clone"] }
 regex = "1.10.6"
 strum = { version = "0.26.3", features = ["derive"] }
 strum_macros = "0.26.4"
@@ -46,7 +46,7 @@ base64 = "0.22.1"
 num-bigint = "0.4.6"
 python3-dll-a = "0.2.10"
 uuid = "1.10.0"
-jiter = { version = "0.5", features = ["python"] }
+jiter = { git = "https://github.com/pydantic/jiter", branch = "dh/pyo3-0.23", features = ["python"] }
 hex = "0.4.3"
 
 [lib]
@@ -74,12 +74,12 @@ debug = true
 strip = false
 
 [dev-dependencies]
-pyo3 = { version = "0.22.2", features = ["auto-initialize"] }
+pyo3 = { git = "https://github.com/pyo3/pyo3", features = ["auto-initialize"] }
 
 [build-dependencies]
 version_check = "0.9.5"
 # used where logic has to be version/distribution specific, e.g. pypy
-pyo3-build-config = { version = "0.22.0" }
+pyo3-build-config = { git = "https://github.com/pyo3/pyo3" }
 
 [lints.clippy]
 dbg_macro = "warn"

Cargo.toml

@@ -527,7 +527,7 @@ impl TzInfo {
     }
 
     #[allow(unused_variables)]
-    fn dst(&self, dt: &Bound<'_, PyAny>) -> Option<&PyDelta> {
+    fn dst(&self, dt: &Bound<'_, PyAny>) -> Option<Bound<'_, PyDelta>> {
         None
     }
 

src/input/datetime.rs

@@ -61,7 +61,7 @@ pub fn from_json<'py>(
         cache_mode: cache_strings,
         partial_mode: allow_partial,
         catch_duplicate_keys: false,
-        lossless_floats: false,
+        float_mode: jiter::FloatMode::Float,
     };
     parse_builder
         .python_parse(py, json_bytes)

src/lib.rs

@@ -1,4 +1,5 @@
 use core::slice::Iter;
+use std::convert::Infallible;
 use std::fmt;
 
 use pyo3::exceptions::{PyAttributeError, PyTypeError};
@@ -407,14 +408,17 @@ impl fmt::Display for PathItem {
     }
 }
 
-impl ToPyObject for PathItem {
-    fn to_object(&self, py: Python<'_>) -> PyObject {
+impl<'py> IntoPyObject<'py> for &'_ PathItem {
+    type Target = PyAny;
+    type Output = Bound<'py, PyAny>;
+    type Error = Infallible;
+    fn into_pyobject(self, py: Python<'py>) -> Result<Self::Output, Self::Error> {
         match self {
-            Self::S(_, val) => val.to_object(py),
-            Self::Pos(val) => val.to_object(py),
-            Self::Neg(val) => {
+            PathItem::S(_, val) => Ok(val.bind(py).clone().into_any()),
+            PathItem::Pos(val) => val.into_pyobject(py).map(Bound::into_any),
+            PathItem::Neg(val) => {
                 let neg_value = -(*val as i64);
-                neg_value.to_object(py)
+                neg_value.into_pyobject(py).map(Bound::into_any)
             }
         }
     }

src/lookup_key.rs

@@ -1,3 +1,4 @@
+use jiter::FloatMode;
 use pyo3::intern;
 use pyo3::prelude::*;
 use pyo3::types::PyDict;
@@ -71,7 +72,7 @@ impl Validator for JsonValidator {
                     cache_mode: state.cache_str(),
                     partial_mode: PartialMode::Off,
                     catch_duplicate_keys: false,
-                    lossless_floats: false,
+                    float_mode: FloatMode::Float,
                 };
                 let obj = parse_builder
                     .python_parse(py, json_bytes)