Merge pull request #57 from simd-lite/fix-write-string-rust

Update dependencies and improve iterator implementations

Author: Licenser

.github/workflows/quality.yaml

@@ -23,7 +23,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: "1.64.0"
+          toolchain: "1.85.0"
           override: true
           components: clippy, rustfmt
       - name: Validate cargo format
@@ -52,8 +52,10 @@ jobs:
         rustflags:
           - flags: "-C target-cpu=native"
             name: "avx2"
-          - flags: "-C target-cpu=native -C target-feature=-avx2"
+          - flags: "-C target-feature=-avx2"
             name: "sse"
+          - flags: "-C target-feature=-avx2,-sse4.2"
+            name: "compat"
         features:
           - "128bit"
           - "custom-types"
@@ -66,7 +68,7 @@ jobs:
       - uses: actions-rs/toolchain@v1
         with:
           profile: minimal
-          toolchain: "1.64.0"
+          toolchain: "1.85.0"
           override: true
           components: llvm-tools-preview
       - name: Install cargo-llcm-cov
@@ -82,4 +84,4 @@ jobs:
           file: ./lcov.txt
           flags: "${{ matrix.features }}-${{ matrix.rustflags.name }}"
           fail_ci_if_error: ${{ github.event_name == 'pull_request' }}
-          verbose: true
+          verbose: true

Cargo.toml

@@ -2,21 +2,21 @@
 name = "value-trait"
 version = "0.10.1"
 authors = ["Heinz N. Gies <[email protected]>"]
-edition = "2021"
+edition = "2024"
 license = "Apache-2.0/MIT"
 description = "Traits to deal with JSONesque values"
 repository = "https://github.com/simd-lite/value-trait"
 readme = "README.md"
 documentation = "https://docs.rs/value-trait"
-rust-version = "1.64"
+rust-version = "1.85"
 
 
 [dependencies]
 itoa = "1"
 ryu = "1"
-halfbrown = { version = "0.2", optional = true }
+halfbrown = { version = "0.3", optional = true }
 float-cmp = "0.10"
-ordered-float = { version = "4", optional = true }
+ordered-float = { version = "5", optional = true }
 hashbrown = { version = "0.15", optional = true }
 abi_stable = { version = "0.11.0", optional = true, default-features = false }
 

src/array.rs

@@ -18,7 +18,7 @@ pub trait Array {
 
     /// Iterates over the values paris
     #[must_use]
-    fn iter<'i>(&'i self) -> Box<dyn Iterator<Item = &Self::Element> + 'i>;
+    fn iter(&self) -> Box<dyn Iterator<Item = &Self::Element> + '_>;
 
     /// Number of key/value pairs
     #[must_use]
@@ -69,7 +69,7 @@ where
 impl<T> Array for Vec<T> {
     type Element = T;
 
-    fn iter<'i>(&'i self) -> Box<dyn Iterator<Item = &T> + 'i> {
+    fn iter(&self) -> Box<dyn Iterator<Item = &T> + '_> {
         Box::new(<[T]>::iter(self))
     }
 

src/base.rs

@@ -1,6 +1,6 @@
 use std::io::{self, Write};
 
-use crate::{array::Array, object::Object, TryTypeError, ValueType};
+use crate::{TryTypeError, ValueType, array::Array, object::Object};
 
 /// Type information on a value
 pub trait TypedValue {

src/derived.rs

@@ -1,6 +1,6 @@
 use std::{borrow::Borrow, hash::Hash};
 
-use crate::{array::Array, object::Object, AccessError, TryTypeError};
+use crate::{AccessError, TryTypeError, array::Array, object::Object};
 
 /// `try_as_*` access to scalar value types
 pub trait ValueTryAsScalar {
@@ -678,7 +678,6 @@ pub trait MutableValueArrayAccess<I> {
 /// Access to a value as an array with error handling
 pub trait ValueArrayTryAccess {
     /// The target for nested lookups
-
     type Target: ?Sized;
     /// Tries to get a value based on n index, returns a type error if the
     /// current value isn't an Array, returns `None` if the index is out of bounds
@@ -705,7 +704,6 @@ pub trait ValueTryIntoArray {
     /// Tries to turn the value into it's array representation
     /// # Errors
     /// if the requested type doesn't match the actual type
-
     fn try_into_array(self) -> Result<Self::Array, TryTypeError>;
 }
 /// A trait that specifies how to turn the Value `into` it's sub types with error handling

src/generator.rs

@@ -128,15 +128,13 @@ pub trait BaseGenerator {
     #[inline]
     fn write_string_content(&mut self, string: &str) -> io::Result<()> {
         let mut string = string.as_bytes();
-
         unsafe {
             // Looking at the table above the lower 5 bits are entirely
             // quote characters that gives us a bitmask of 0x1f for that
             // region, only quote (`"`) and backslash (`\`) are not in
             // this range.
             stry!(self.write_str_simd(&mut string));
         }
-
         write_string_rust(self.get_writer(), &mut string)
     }
 
@@ -238,7 +236,9 @@ pub trait BaseGenerator {
     /// # Errors
     ///  if the write fails
     unsafe fn write_str_simd(&mut self, string: &mut &[u8]) -> io::Result<()> {
-        self.write_simple_string(std::str::from_utf8_unchecked(string))
+        write_string_rust(self.get_writer(), string)?;
+        *string = &string[string.len()..];
+        Ok(())
     }
 
     #[cfg(target_arch = "aarch64")]
@@ -257,57 +257,63 @@ pub trait BaseGenerator {
 
         #[inline]
         unsafe fn bit_mask() -> uint8x16_t {
-            mem::transmute([
-                0x01_u8, 0x02, 0x4, 0x8, 0x10, 0x20, 0x40, 0x80, 0x01, 0x02, 0x4, 0x8, 0x10, 0x20,
-                0x40, 0x80,
-            ])
+            unsafe {
+                mem::transmute([
+                    0x01_u8, 0x02, 0x4, 0x8, 0x10, 0x20, 0x40, 0x80, 0x01, 0x02, 0x4, 0x8, 0x10,
+                    0x20, 0x40, 0x80,
+                ])
+            }
         }
 
         #[inline]
         unsafe fn neon_movemask(input: uint8x16_t) -> u16 {
-            let simd_input: uint8x16_t = vandq_u8(input, bit_mask());
-            let tmp: uint8x16_t = vpaddq_u8(simd_input, simd_input);
-            let tmp = vpaddq_u8(tmp, tmp);
-            let tmp = vpaddq_u8(tmp, tmp);
+            unsafe {
+                let simd_input: uint8x16_t = vandq_u8(input, bit_mask());
+                let tmp: uint8x16_t = vpaddq_u8(simd_input, simd_input);
+                let tmp = vpaddq_u8(tmp, tmp);
+                let tmp = vpaddq_u8(tmp, tmp);
 
-            vgetq_lane_u16(vreinterpretq_u16_u8(tmp), 0)
+                vgetq_lane_u16(vreinterpretq_u16_u8(tmp), 0)
+            }
         }
 
         let writer = self.get_writer();
         // The case where we have a 16+ byte block
         // we repeate the same logic as above but with
         // only 16 bytes
         let mut idx = 0;
-        let zero = vdupq_n_u8(0);
-        let lower_quote_range = vdupq_n_u8(0x1F);
-        let quote = vdupq_n_u8(b'"');
-        let backslash = vdupq_n_u8(b'\\');
-        while string.len() - idx > 16 {
-            // Load 16 bytes of data;
-            let data: uint8x16_t = vld1q_u8(string.as_ptr().add(idx));
-            // Test the data against being backslash and quote.
-            let bs_or_quote = vorrq_u8(vceqq_u8(data, backslash), vceqq_u8(data, quote));
-            // Now mask the data with the quote range (0x1F).
-            let in_quote_range = vandq_u8(data, lower_quote_range);
-            // then test of the data is unchanged. aka: xor it with the
-            // Any field that was inside the quote range it will be zero
-            // now.
-            let is_unchanged = veorq_u8(data, in_quote_range);
-            let in_range = vceqq_u8(is_unchanged, zero);
-            let quote_bits = neon_movemask(vorrq_u8(bs_or_quote, in_range));
-            if quote_bits == 0 {
-                idx += 16;
-            } else {
-                let quote_dist = quote_bits.trailing_zeros() as usize;
-                stry!(writer.write_all(&string[0..idx + quote_dist]));
-                let ch = string[idx + quote_dist];
-                match ESCAPED[ch as usize] {
-                    b'u' => stry!(u_encode(writer, ch)),
-                    escape => stry!(writer.write_all(&[b'\\', escape])),
+        unsafe {
+            let zero = vdupq_n_u8(0);
+            let lower_quote_range = vdupq_n_u8(0x1F);
+            let quote = vdupq_n_u8(b'"');
+            let backslash = vdupq_n_u8(b'\\');
+            while string.len() - idx > 16 {
+                // Load 16 bytes of data;
+                let data: uint8x16_t = vld1q_u8(string.as_ptr().add(idx));
+                // Test the data against being backslash and quote.
+                let bs_or_quote = vorrq_u8(vceqq_u8(data, backslash), vceqq_u8(data, quote));
+                // Now mask the data with the quote range (0x1F).
+                let in_quote_range = vandq_u8(data, lower_quote_range);
+                // then test of the data is unchanged. aka: xor it with the
+                // Any field that was inside the quote range it will be zero
+                // now.
+                let is_unchanged = veorq_u8(data, in_quote_range);
+                let in_range = vceqq_u8(is_unchanged, zero);
+                let quote_bits = neon_movemask(vorrq_u8(bs_or_quote, in_range));
+                if quote_bits == 0 {
+                    idx += 16;
+                } else {
+                    let quote_dist = quote_bits.trailing_zeros() as usize;
+                    stry!(writer.write_all(&string[0..idx + quote_dist]));
+                    let ch = string[idx + quote_dist];
+                    match ESCAPED[ch as usize] {
+                        b'u' => stry!(u_encode(writer, ch)),
+                        escape => stry!(writer.write_all(&[b'\\', escape])),
+                    }
+
+                    *string = &string[idx + quote_dist + 1..];
+                    idx = 0;
                 }
-
-                *string = &string[idx + quote_dist + 1..];
-                idx = 0;
             }
         }
         stry!(writer.write_all(&string[0..idx]));
@@ -414,11 +420,9 @@ where
         write_str_simd_sse42(writer, string)
     } else {
         #[cfg(not(feature = "portable"))]
-        let r = write_string_rust(writer, string);
+        return write_string_rust(writer, string);
         #[cfg(feature = "portable")]
-        let r = write_str_simd_portable(writer, string);
-
-        r
+        return write_str_simd_portable(writer, string);
     }
 }
 #[inline]
@@ -468,7 +472,7 @@ unsafe fn write_str_simd_portable<W>(writer: &mut W, string: &mut &[u8]) -> io::
 where
     W: Write,
 {
-    use std::simd::{u8x32, SimdPartialEq, ToBitMask};
+    use std::simd::{SimdPartialEq, ToBitMask, u8x32};
 
     let mut idx = 0;
     let zero = u8x32::splat(0);
@@ -781,7 +785,7 @@ where
     }
 }
 
-impl<'w, W> BaseGenerator for WriterGenerator<'w, W>
+impl<W> BaseGenerator for WriterGenerator<'_, W>
 where
     W: Write,
 {
@@ -799,7 +803,6 @@ where
 }
 
 /// Pretty Writer Generator
-
 pub struct PrettyWriterGenerator<'w, W>
 where
     W: 'w + Write,
@@ -823,7 +826,7 @@ where
     }
 }
 
-impl<'w, W> BaseGenerator for PrettyWriterGenerator<'w, W>
+impl<W> BaseGenerator for PrettyWriterGenerator<'_, W>
 where
     W: Write,
 {
@@ -873,3 +876,22 @@ pub(crate) fn extend_from_slice(dst: &mut Vec<u8>, src: &[u8]) {
         dst.set_len(dst_len + src_len);
     }
 }
+
+#[cfg(test)]
+mod tests {
+
+    #[test]
+    fn test_write_string_rust() {
+        let mut writer = Vec::new();
+        let mut string = "Hello, World!".as_bytes();
+        super::write_string_rust(&mut writer, &mut string).expect("failed to write string");
+        assert_eq!(writer, "Hello, World!".as_bytes());
+    }
+    #[test]
+    fn test_write_string_rust2() {
+        let mut writer = Vec::new();
+        let mut string = "Hello, \"World!\"".as_bytes();
+        super::write_string_rust(&mut writer, &mut string).expect("failed to write string");
+        assert_eq!(writer, "Hello, \\\"World!\\\"".as_bytes());
+    }
+}

src/impls.rs

@@ -1,6 +1,7 @@
 use std::{borrow::Borrow, hash::Hash};
 
 use crate::{
+    AccessError, ExtendedValueType, TryTypeError, ValueType,
     array::{self, ArrayMut, Indexed, IndexedMut},
     base::{TypedValue, ValueAsScalar, ValueIntoString, ValueTryAsArrayMut, ValueTryAsMutObject},
     derived::{
@@ -16,7 +17,6 @@ use crate::{
         ValueAsArray, ValueAsMutArray, ValueAsMutObject, ValueAsObject, ValueIntoArray,
         ValueIntoObject,
     },
-    AccessError, ExtendedValueType, TryTypeError, ValueType,
 };
 
 impl<T> ValueTryIntoString for T

src/lib.rs

@@ -24,7 +24,9 @@ compile_error!(
 );
 
 #[cfg(all(feature = "c-abi", feature = "ordered-float"))]
-compile_error!("Combining the features `c-abi` and `ordered-float` is impossible because ordered_float::OrderedFloat does not implement `StableAbi`");
+compile_error!(
+    "Combining the features `c-abi` and `ordered-float` is impossible because ordered_float::OrderedFloat does not implement `StableAbi`"
+);
 
 use std::borrow::Cow;
 use std::fmt;

src/node.rs

@@ -1,6 +1,6 @@
 use crate::base::{TypedValue, ValueAsScalar};
 
-use super::{fmt, ValueType};
+use super::{ValueType, fmt};
 use std::convert::TryFrom;
 use std::ops::{Index, IndexMut};