cargo update, build misc

ijl · ijl · commit e04ea735b087 · 2024-02-23T00:07:53.000Z
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -45,7 +45,7 @@ no-panic = [
 yyjson = []
 
 [dependencies]
-ahash = { version = "^0.8.8", default_features = false, features = ["compile-time-rng"] }
+ahash = { version = "^0.8.9", default_features = false, features = ["compile-time-rng"] }
 arrayvec = { version = "0.7", default_features = false, features = ["std", "serde"] }
 associative-cache = { version = "2", default_features = false }
 beef = { version = "0.5", default_features = false, features = ["impl_serde"] }
diff --git a/script/develop b/script/develop
@@ -2,10 +2,13 @@
 
 rm -f target/wheels/*
 
-export CC="clang"
-export CFLAGS="-O2 -fstrict-aliasing -emit-llvm -flto=full"
-export LDFLAGS="${CFLAGS} -fuse-ld=lld -Wl,--as-needed -Wl,-plugin-opt=also-emit-llvm"
-export RUSTFLAGS="-C linker=clang -C linker-plugin-lto -C lto=fat -C link-arg=-fuse-ld=lld -Z mir-opt-level=4 -Z virtual-function-elimination"
+export CC="${CC:-clang}"
+export LD="${LD:-lld}"
+
+echo "CC: ${CC}, LD: ${LD}, LD_LIBRARY_PATH: ${LD_LIBRARY_PATH}"
+export CFLAGS="-Os -fstrict-aliasing -emit-llvm -flto=full"
+export LDFLAGS="${CFLAGS} -fuse-ld=${LD} -Wl,--as-needed -Wl,-plugin-opt=also-emit-llvm"
+export RUSTFLAGS="-C linker=${CC} -C linker-plugin-lto -C lto=fat -C link-arg=-fuse-ld=${LD} -Z mir-opt-level=4 -Z virtual-function-elimination"
 
 maturin build "$@"
 
diff --git a/script/graph b/script/graph
@@ -89,6 +89,8 @@ def tab(obj):
         if not per_op_data:
             continue
 
+        clamp = 10 if operation == "serialization" else 5
+
         json_baseline = {}
         for each in per_op_data:
             if each["group"] == "witter.json":
@@ -97,7 +99,9 @@ def tab(obj):
                 json_baseline[each["group"]] = each["operations"]
 
         for each in per_op_data:
-            each["relative"] = each["operations"] / json_baseline[each["group"]]
+            each["relative"] = min(
+                each["operations"] / json_baseline[each["group"]], clamp
+            )
 
         p = pd.DataFrame.from_dict(per_op_data)
         p.groupby("group")
@@ -117,7 +121,6 @@ def tab(obj):
         pyplot.title(operation)
 
         # ensure Y range
-        clamp = 10 if operation == "serialization" else 5
         ylabels = set((min(v, clamp) for v in pyplot.gca().get_yticks()))
         pyplot.gca().set_yticks(list({1.0, 1.5}.union(ylabels)))
 
diff --git a/src/deserialize/cache.rs b/src/deserialize/cache.rs
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: (Apache-2.0 OR MIT)
 
-use associative_cache::replacement::RoundRobinReplacement;
-use associative_cache::*;
+use associative_cache::{AssociativeCache, Capacity1024, HashDirectMapped, RoundRobinReplacement};
 use core::ffi::c_void;
 use once_cell::unsync::OnceCell;
 use std::hash::Hasher;
diff --git a/src/deserialize/error.rs b/src/deserialize/error.rs
@@ -51,9 +51,10 @@ impl<'a> DeserializeError<'a> {
     /// Return position of the error in the deserialized data
     #[cold]
     #[cfg(feature = "yyjson")]
+    #[cfg_attr(feature = "optimize", optimize(size))]
     pub fn pos(&self) -> i64 {
         match self.data {
-            Some(as_str) => bytecount::num_chars(&as_str.as_bytes()[0..self.pos as usize]) as i64,
+            Some(as_str) => as_str[0..self.pos as usize].chars().count() as i64,
             None => 0,
         }
     }
diff --git a/src/serialize/per_type/numpy.rs b/src/serialize/per_type/numpy.rs
@@ -10,7 +10,6 @@ use chrono::{Datelike, NaiveDate, NaiveDateTime, Timelike};
 use core::ffi::{c_char, c_int, c_void};
 use pyo3_ffi::*;
 use serde::ser::{self, Serialize, SerializeSeq, Serializer};
-use std::convert::TryInto;
 use std::fmt;
 
 #[repr(transparent)]

Original file line number	Diff line number	Diff line change
`@@ -51,9 +51,10 @@ impl<'a> DeserializeError<'a> {`
`51`	`51`	`/// Return position of the error in the deserialized data`
`52`	`52`	`#[cold]`
`53`	`53`	`#[cfg(feature = "yyjson")]`
	`54`	`+ #[cfg_attr(feature = "optimize", optimize(size))]`
`54`	`55`	`pub fn pos(&self) -> i64 {`
`55`	`56`	`match self.data {`
`56`		`- Some(as_str) => bytecount::num_chars(&as_str.as_bytes()[0..self.pos as usize]) as i64,`
	`57`	`+ Some(as_str) => as_str[0..self.pos as usize].chars().count() as i64,`
`57`	`58`	`None => 0,`
`58`	`59`	`}`
`59`	`60`	`}`