cargo update

.github/workflows/manylinux_2_28.yaml

@@ -19,7 +19,7 @@ jobs:
           { version: '3.11', abi: 'cp311-cp311' },
         ]
     env:
-      PATH: /github/home/.local/bin:/github/home/.cargo/bin:/opt/python/${{ matrix.python.abi }}/bin:/opt/rh/gcc-toolset-11/root/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+      PATH: /github/home/.local/bin:/github/home/.cargo/bin:/opt/python/${{ matrix.python.abi }}/bin:/opt/rh/gcc-toolset-12/root/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
       CC: "clang"
       CFLAGS: "-O2 -fno-plt -flto=thin"
       LDFLAGS: "-O2 -flto=thin -fuse-ld=lld -Wl,--as-needed"

Cargo.toml

@@ -36,7 +36,6 @@ default = []
 unstable-simd = [
     "bytecount/generic-simd",
     "encoding_rs/simd-accel",
-    "simdutf8/aarch64_neon",
 ]
 
 # Build yyjson as a backend and panic if it fails. The default is to attempt
@@ -58,7 +57,7 @@ pyo3-ffi = { version = "0.17", default_features = false, features = ["extension-
 ryu = { version = "1", default_features = false }
 serde = { version = "1", default_features = false }
 serde_json = { path = "include/json", default_features = false, features = ["std", "float_roundtrip"] }
-simdutf8 = { version = "0.1", default_features = false, features = ["std"] }
+simdutf8 = { version = "0.1", default_features = false, features = ["std", "aarch64_neon"] }
 smallvec = { version = "^1.10", default_features = false, features = ["union", "write"] }
 
 [build-dependencies]

ci/azure-pipelines.yml

@@ -9,7 +9,7 @@ jobs:
   container: quay.io/pypa/manylinux_2_28_x86_64:latest
   variables:
     interpreter: python3.10
-    path: /home/vsts_azpcontainer/.local/bin:/home/vsts_azpcontainer/.cargo/bin:/opt/python/cp310-cp310/bin:/opt/rh/gcc-toolset-11/root/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+    path: /home/vsts_azpcontainer/.local/bin:/home/vsts_azpcontainer/.cargo/bin:/opt/python/cp310-cp310/bin:/opt/rh/gcc-toolset-12/root/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
     target: x86_64-unknown-linux-gnu
     toolchain: 1.60.0
   steps:
@@ -23,7 +23,7 @@ jobs:
   variables:
     interpreter: python3.10
     compatibility: off
-    path: /home/vsts_azpcontainer/.local/bin:/home/vsts_azpcontainer/.cargo/bin:/opt/python/cp310-cp310/bin:/opt/rh/gcc-toolset-11/root/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+    path: /home/vsts_azpcontainer/.local/bin:/home/vsts_azpcontainer/.cargo/bin:/opt/python/cp310-cp310/bin:/opt/rh/gcc-toolset-12/root/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
   steps:
   - checkout: self
   - template: ./azure-debug.yml

include/json/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "serde_json"
-version = "1.0.88" # remember to update html_root_url
+version = "1.0.89" # remember to update html_root_url
 authors = ["Erick Tryzelaar <erick.tryzelaar@gmail.com>", "David Tolnay <dtolnay@gmail.com>"]
 categories = ["encoding", "parser-implementations", "no-std"]
 description = "A JSON serialization file format"

include/json/src/de.rs

@@ -451,30 +451,33 @@ impl<'de, R: Read<'de>> Deserializer<R> {
         &mut self,
         positive: bool,
         mut significand: u64,
-        mut exponent: i32,
+        exponent_before_decimal_point: i32,
     ) -> Result<f64> {
         self.eat_char();
 
+        let mut exponent_after_decimal_point = 0;
         while let c @ b'0'..=b'9' = tri!(self.peek_or_null()) {
             let digit = (c - b'0') as u64;
 
             if overflow!(significand * 10 + digit, u64::max_value()) {
+                let exponent = exponent_before_decimal_point + exponent_after_decimal_point;
                 return self.parse_decimal_overflow(positive, significand, exponent);
             }
 
             self.eat_char();
             significand = significand * 10 + digit;
-            exponent -= 1;
+            exponent_after_decimal_point -= 1;
         }
 
         // Error if there is not at least one digit after the decimal point.
-        if exponent == 0 {
+        if exponent_after_decimal_point == 0 {
             match tri!(self.peek()) {
                 Some(_) => return Err(self.peek_error(ErrorCode::InvalidNumber)),
                 None => return Err(self.peek_error(ErrorCode::EofWhileParsingValue)),
             }
         }
 
+        let exponent = exponent_before_decimal_point + exponent_after_decimal_point;
         match tri!(self.peek_or_null()) {
             b'e' | b'E' => self.parse_exponent(positive, significand, exponent),
             _ => self.f64_from_parts(positive, significand, exponent),

include/json/src/lib.rs

@@ -300,7 +300,7 @@
 //! [macro]: https://docs.serde.rs/serde_json/macro.json.html
 //! [`serde-json-core`]: https://github.com/rust-embedded-community/serde-json-core
 
-#![doc(html_root_url = "https://docs.rs/serde_json/1.0.88")]
+#![doc(html_root_url = "https://docs.rs/serde_json/1.0.89")]
 // Ignored clippy lints
 #![allow(
     clippy::collapsible_else_if,

include/json/src/ser.rs

@@ -2017,7 +2017,7 @@ where
     }
 }
 
-#[cold]
+#[inline(never)]
 fn format_escaped_str_with_escapes<W, F>(
     writer: &mut W,
     formatter: &mut F,

include/json/src/value/de.rs

@@ -994,7 +994,7 @@ impl<'de> VariantAccess<'de> for VariantRefDeserializer<'de> {
         V: Visitor<'de>,
     {
         match self.value {
-            Some(&Value::Array(ref v)) => {
+            Some(Value::Array(v)) => {
                 if v.is_empty() {
                     visitor.visit_unit()
                 } else {
@@ -1021,7 +1021,7 @@ impl<'de> VariantAccess<'de> for VariantRefDeserializer<'de> {
         V: Visitor<'de>,
     {
         match self.value {
-            Some(&Value::Object(ref v)) => visit_object_ref(v, visitor),
+            Some(Value::Object(v)) => visit_object_ref(v, visitor),
             Some(other) => Err(serde::de::Error::invalid_type(
                 other.unexpected(),
                 &"struct variant",