Merge remote-tracking branch 'origin/develop-0.12' into feature/37-im…

…prove-error-messages

# Conflicts:
#	serde_arrow/src/internal/error.rs

.github/workflows/test.yml

@@ -4,7 +4,8 @@
     "workflow_dispatch": {},
     "pull_request": {
       "branches": [
-        "main"
+        "main",
+        "develop-*"
       ],
       "types": [
         "opened",

serde_arrow/src/internal/array_builder.rs

@@ -95,3 +95,8 @@ impl std::convert::AsMut<ArrayBuilder> for ArrayBuilder {
         self
     }
 }
+
+const _: () = {
+    trait AssertSendSync: Send + Sync {}
+    impl AssertSendSync for ArrayBuilder {}
+};

serde_arrow/src/internal/deserializer.rs

@@ -194,3 +194,8 @@ impl<'de> serde::de::Deserializer<'de> for Deserializer<'de> {
         false
     }
 }
+
+const _: () = {
+    trait AssertSendSync: Send + Sync {}
+    impl<'de> AssertSendSync for Deserializer<'de> {}
+};

serde_arrow/src/internal/error.rs

@@ -290,3 +290,9 @@ fn error_can_be_converted_to_anyhow() {
     }
     assert!(func().is_err());
 }
+
+const _: () = {
+    trait AssertSendSync: Send + Sync {}
+    impl AssertSendSync for Error {}
+    impl<T: Send + Sync> AssertSendSync for Result<T> {}
+};

serde_arrow/src/internal/schema/extensions/mod.rs

@@ -6,3 +6,10 @@ mod variable_shape_tensor_field;
 pub use bool8_field::Bool8Field;
 pub use fixed_shape_tensor_field::FixedShapeTensorField;
 pub use variable_shape_tensor_field::VariableShapeTensorField;
+
+const _: () = {
+    trait AssertSendSync: Send + Sync {}
+    impl AssertSendSync for Bool8Field {}
+    impl AssertSendSync for FixedShapeTensorField {}
+    impl AssertSendSync for VariableShapeTensorField {}
+};

serde_arrow/src/internal/schema/mod.rs

@@ -546,3 +546,11 @@ impl<'a> std::fmt::Display for DataTypeDisplay<'a> {
         }
     }
 }
+
+const _: () = {
+    trait AssertSendSync: Send + Sync {}
+    impl AssertSendSync for SerdeArrowSchema {}
+    impl AssertSendSync for TracingOptions {}
+    impl AssertSendSync for Strategy {}
+    impl AssertSendSync for Overwrites {}
+};

serde_arrow/src/internal/serialization/struct_builder.rs

@@ -218,12 +218,23 @@ impl SimpleSerializer for StructBuilder {
     }
 }
 
+/// Optimize field lookups for static names
 #[derive(Debug, Clone)]
 pub struct FieldLookup {
-    pub cached_names: Vec<Option<(*const u8, usize)>>,
+    pub cached_names: Vec<Option<StaticFieldName>>,
     pub index: BTreeMap<String, usize>,
 }
 
+/// A wrapper around a static field name that compares using ptr and length
+#[derive(Debug, Clone)]
+pub struct StaticFieldName(&'static str);
+
+impl std::cmp::PartialEq for StaticFieldName {
+    fn eq(&self, other: &Self) -> bool {
+        (self.0.as_ptr(), self.0.len()) == (other.0.as_ptr(), other.0.len())
+    }
+}
+
 impl FieldLookup {
     pub fn new(field_names: Vec<String>) -> Result<Self> {
         let mut index = BTreeMap::new();
@@ -247,13 +258,12 @@ impl FieldLookup {
     }
 
     pub fn lookup(&mut self, guess: usize, key: &'static str) -> Option<usize> {
-        let fast_key = (key.as_ptr(), key.len());
-        if self.cached_names.get(guess) == Some(&Some(fast_key)) {
+        if self.cached_names.get(guess) == Some(&Some(StaticFieldName(key))) {
             Some(guess)
         } else {
             let &idx = self.index.get(key)?;
             if self.cached_names[idx].is_none() {
-                self.cached_names[idx] = Some(fast_key);
+                self.cached_names[idx] = Some(StaticFieldName(key));
             }
             Some(idx)
         }

serde_arrow/src/internal/serializer.rs

@@ -281,3 +281,8 @@ impl<A: AsMut<ArrayBuilder>> serde::ser::SerializeTupleVariant for CollectionSer
         Ok(Serializer(self.0))
     }
 }
+
+const _: () = {
+    trait AssertSendSync: Send + Sync {}
+    impl<A: Send + Sync> AssertSendSync for Serializer<A> {}
+};

x.py

@@ -35,7 +35,7 @@
     "on": {
         "workflow_dispatch": {},
         "pull_request": {
-            "branches": ["main"],
+            "branches": ["main", "develop-*"],
             "types": [
                 "opened",
                 "edited",