Followup

Author: AdamGS

arrow-integration-testing/Cargo.toml

@@ -40,7 +40,6 @@ arrow-integration-test = { path = "../arrow-integration-test", default-features
 clap = { version = "4", default-features = false, features = ["std", "derive", "help", "error-context", "usage"] }
 futures = { version = "0.3", default-features = false }
 prost = { version = "0.14.1", default-features = false }
-serde = { version = "1.0", default-features = false, features = ["rc", "derive"] }
 serde_json = { version = "1.0", default-features = false, features = ["std"] }
 tokio = { version = "1.0", default-features = false, features = [ "rt-multi-thread"] }
 tonic = { version = "0.14.1", default-features = false }

arrow-schema/Cargo.toml

@@ -37,14 +37,17 @@ serde_core = { version = "1.0", default-features = false, features = [
     "std",
     "rc",
 ], optional = true }
+serde = { version = "1.0", default-features = false, features = [
+    "derive",
+], optional = true }
 bitflags = { version = "2.0.0", default-features = false, optional = true }
 serde_json = { version = "1.0", optional = true }
 
 [features]
 canonical_extension_types = ["dep:serde_core", "dep:serde_json"]
 # Enable ffi support
 ffi = ["bitflags"]
-serde = ["dep:serde_core"]
+serde = ["dep:serde_core", "dep:serde"]
 
 [package.metadata.docs.rs]
 all-features = true

arrow-schema/src/extension/canonical/fixed_shape_tensor.rs

@@ -19,7 +19,10 @@
 //!
 //! <https://arrow.apache.org/docs/format/CanonicalExtensions.html#fixed-shape-tensor>
 
-use serde::{Deserialize, Deserializer, Serialize, Serializer};
+use serde_core::de::{self, MapAccess, Visitor};
+use serde_core::ser::SerializeStruct;
+use serde_core::{Deserialize, Deserializer, Serialize, Serializer};
+use std::fmt;
 
 use crate::{ArrowError, DataType, extension::ExtensionType};
 
@@ -146,7 +149,6 @@ impl Serialize for FixedShapeTensorMetadata {
     where
         S: Serializer,
     {
-        use serde::ser::SerializeStruct;
         let mut state = serializer.serialize_struct("FixedShapeTensorMetadata", 3)?;
         state.serialize_field("shape", &self.shape)?;
         state.serialize_field("dim_names", &self.dim_names)?;
@@ -160,9 +162,6 @@ impl<'de> Deserialize<'de> for FixedShapeTensorMetadata {
     where
         D: Deserializer<'de>,
     {
-        use serde::de::{self, MapAccess, Visitor};
-        use std::fmt;
-
         #[derive(Debug)]
         enum Field {
             Shape,
@@ -275,7 +274,11 @@ impl<'de> Deserialize<'de> for FixedShapeTensorMetadata {
         }
 
         const FIELDS: &[&str] = &["shape", "dim_names", "permutations"];
-        deserializer.deserialize_struct("FixedShapeTensorMetadata", FIELDS, FixedShapeTensorMetadataVisitor)
+        deserializer.deserialize_struct(
+            "FixedShapeTensorMetadata",
+            FIELDS,
+            FixedShapeTensorMetadataVisitor,
+        )
     }
 }
 
@@ -515,9 +518,8 @@ mod tests {
     }
 
     #[test]
-    #[should_panic(
-        expected = "FixedShapeTensor metadata deserialization failed: missing field `shape`"
-    )]
+    #[should_panic(expected = "FixedShapeTensor metadata deserialization failed: \
+        unknown field `not-shape`, expected one of `shape`, `dim_names`, `permutations`")]
     fn invalid_metadata() {
         let fixed_shape_tensor =
             FixedShapeTensor::try_new(DataType::Float32, [100, 200, 500], None, None).unwrap();

arrow-schema/src/extension/canonical/opaque.rs

@@ -19,6 +19,7 @@
 //!
 //! <https://arrow.apache.org/docs/format/CanonicalExtensions.html#opaque>
 
+use serde_core::ser::SerializeStruct;
 use serde_core::{
     Deserialize, Deserializer, Serialize, Serializer,
     de::{MapAccess, Visitor},

arrow-schema/src/extension/canonical/variable_shape_tensor.rs

@@ -19,7 +19,9 @@
 //!
 //! <https://arrow.apache.org/docs/format/CanonicalExtensions.html#variable-shape-tensor>
 
-use serde::{Deserialize, Deserializer, Serialize, Serializer};
+use serde_core::de::{self, MapAccess, Visitor};
+use serde_core::{Deserialize, Deserializer, Serialize, Serializer};
+use std::fmt;
 
 use crate::{ArrowError, DataType, Field, extension::ExtensionType};
 
@@ -158,7 +160,7 @@ impl Serialize for VariableShapeTensorMetadata {
     where
         S: Serializer,
     {
-        use serde::ser::SerializeStruct;
+        use serde_core::ser::SerializeStruct;
         let mut state = serializer.serialize_struct("VariableShapeTensorMetadata", 3)?;
         state.serialize_field("dim_names", &self.dim_names)?;
         state.serialize_field("permutations", &self.permutations)?;
@@ -172,9 +174,6 @@ impl<'de> Deserialize<'de> for VariableShapeTensorMetadata {
     where
         D: Deserializer<'de>,
     {
-        use serde::de::{self, MapAccess, Visitor};
-        use std::fmt;
-
         #[derive(Debug)]
         enum Field {
             DimNames,
@@ -285,7 +284,11 @@ impl<'de> Deserialize<'de> for VariableShapeTensorMetadata {
         }
 
         const FIELDS: &[&str] = &["dim_names", "permutations", "uniform_shape"];
-        deserializer.deserialize_struct("VariableShapeTensorMetadata", FIELDS, VariableShapeTensorMetadataVisitor)
+        deserializer.deserialize_struct(
+            "VariableShapeTensorMetadata",
+            FIELDS,
+            VariableShapeTensorMetadataVisitor,
+        )
     }
 }