update JsonValue allow_partial to use PartialMode (#163)

Cargo.toml

@@ -8,7 +8,7 @@ resolver = "2"
 
 [workspace.package]
 authors = ["Samuel Colvin <samuel@pydantic.dev>"]
-version = "0.7.0"
+version = "0.7.1"
 edition = "2021"
 license = "MIT"
 keywords = ["JSON", "parsing", "deserialization", "iter"]

crates/jiter/benches/main.rs

@@ -4,7 +4,7 @@ use std::hint::black_box;
 use std::fs::File;
 use std::io::Read;
 
-use jiter::{Jiter, JsonValue, LazyIndexMap, Peek};
+use jiter::{Jiter, JsonValue, LazyIndexMap, PartialMode, Peek};
 use serde_json::Value;
 
 fn read_file(path: &str) -> String {
@@ -258,7 +258,7 @@ fn string_array_jiter_value_owned(bench: &mut Bencher) {
     let json = read_file("./benches/string_array.json");
     let json_data = json.as_bytes();
     bench.iter(|| {
-        let v = JsonValue::parse_owned(black_box(json_data), false, false).unwrap();
+        let v = JsonValue::parse_owned(black_box(json_data), false, PartialMode::Off).unwrap();
         black_box(v)
     })
 }
@@ -267,7 +267,7 @@ fn medium_response_jiter_value_owned(bench: &mut Bencher) {
     let json = read_file("./benches/medium_response.json");
     let json_data = json.as_bytes();
     bench.iter(|| {
-        let v = JsonValue::parse_owned(black_box(json_data), false, false).unwrap();
+        let v = JsonValue::parse_owned(black_box(json_data), false, PartialMode::Off).unwrap();
         black_box(v)
     })
 }

crates/jiter/src/jiter.rs

@@ -3,7 +3,7 @@ use crate::number_decoder::{NumberAny, NumberFloat, NumberInt, NumberRange};
 use crate::parse::{Parser, Peek};
 use crate::string_decoder::{StringDecoder, StringDecoderRange, Tape};
 use crate::value::{take_value_borrowed, take_value_owned, take_value_skip, JsonValue};
-use crate::{JsonError, JsonErrorType};
+use crate::{JsonError, JsonErrorType, PartialMode};
 
 pub type JiterResult<T> = Result<T, JiterError>;
 
@@ -242,7 +242,7 @@ impl<'j> Jiter<'j> {
             &mut self.tape,
             DEFAULT_RECURSION_LIMIT,
             self.allow_inf_nan,
-            false,
+            PartialMode::Off,
         )
         .map_err(Into::into)
     }
@@ -289,7 +289,7 @@ impl<'j> Jiter<'j> {
             &mut self.tape,
             DEFAULT_RECURSION_LIMIT,
             self.allow_inf_nan,
-            false,
+            PartialMode::Off,
         )
         .map_err(Into::into)
     }

crates/jiter/src/lib.rs

@@ -28,4 +28,37 @@ pub use py_lossless_float::{FloatMode, LosslessFloat};
 #[cfg(feature = "python")]
 pub use py_string_cache::{cache_clear, cache_usage, cached_py_string, pystring_fast_new, StringCacheMode};
 #[cfg(feature = "python")]
-pub use python::{map_json_error, PartialMode, PythonParse};
+pub use python::{map_json_error, PythonParse};
+
+#[derive(Debug, Clone, Copy)]
+pub enum PartialMode {
+    Off,
+    On,
+    TrailingStrings,
+}
+
+impl Default for PartialMode {
+    fn default() -> Self {
+        Self::Off
+    }
+}
+
+impl From<bool> for PartialMode {
+    fn from(mode: bool) -> Self {
+        if mode {
+            Self::On
+        } else {
+            Self::Off
+        }
+    }
+}
+
+impl PartialMode {
+    pub fn is_active(self) -> bool {
+        !matches!(self, Self::Off)
+    }
+
+    pub fn allow_trailing_str(self) -> bool {
+        matches!(self, Self::TrailingStrings)
+    }
+}

crates/jiter/src/python.rs

@@ -15,7 +15,7 @@ use crate::parse::{Parser, Peek};
 use crate::py_lossless_float::{get_decimal_type, FloatMode};
 use crate::py_string_cache::{StringCacheAll, StringCacheKeys, StringCacheMode, StringMaybeCache, StringNoCache};
 use crate::string_decoder::{StringDecoder, Tape};
-use crate::{JsonErrorType, LosslessFloat};
+use crate::{JsonErrorType, LosslessFloat, PartialMode};
 
 #[derive(Default)]
 #[allow(clippy::struct_excessive_bools)]
@@ -234,19 +234,6 @@ impl<'j, StringCache: StringMaybeCache, KeyCheck: MaybeKeyCheck, ParseNumber: Ma
     }
 }
 
-#[derive(Debug, Clone, Copy)]
-pub enum PartialMode {
-    Off,
-    On,
-    TrailingStrings,
-}
-
-impl Default for PartialMode {
-    fn default() -> Self {
-        Self::Off
-    }
-}
-
 const PARTIAL_ERROR: &str = "Invalid partial mode, should be `'off'`, `'on'`, `'trailing-strings'` or a `bool`";
 
 impl<'py> FromPyObject<'py> for PartialMode {
@@ -266,26 +253,6 @@ impl<'py> FromPyObject<'py> for PartialMode {
     }
 }
 
-impl From<bool> for PartialMode {
-    fn from(mode: bool) -> Self {
-        if mode {
-            Self::On
-        } else {
-            Self::Off
-        }
-    }
-}
-
-impl PartialMode {
-    fn is_active(self) -> bool {
-        !matches!(self, Self::Off)
-    }
-
-    fn allow_trailing_str(self) -> bool {
-        matches!(self, Self::TrailingStrings)
-    }
-}
-
 trait MaybeKeyCheck: Default {
     fn check(&mut self, key: &str, index: usize) -> JsonResult<()>;
 }