Remove derive_more dependency (#1406)

* Remove derive_more dependency

* Add #[inline]

Cargo.toml

@@ -47,7 +47,6 @@ arrow2_convert = "0.4.2"
 chrono = "0.4"                                              # TODO(emilk): replace `chrono` with `time` crate
 clap = "4.0"
 comfy-table = { version = "6.1", default-features = false }
-derive_more = "0.99"
 ecolor = "0.21.0"
 eframe = { version = "0.21.3", default-features = false }
 egui = "0.21.0"

crates/re_analytics/Cargo.toml

@@ -23,7 +23,6 @@ re_log.workspace = true
 # External dependencies:
 anyhow.workspace = true
 crossbeam = "0.8"
-derive_more.workspace = true
 once_cell = "1.17"
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"

crates/re_analytics/src/lib.rs

@@ -112,12 +112,12 @@ impl Event {
     }
 }
 
-#[derive(Debug, Clone, derive_more::From, serde::Serialize, serde::Deserialize)]
+#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
 pub enum Property {
+    Bool(bool),
     Integer(i64),
     Float(f64),
     String(String),
-    Bool(bool),
 }
 
 impl Property {
@@ -131,12 +131,40 @@ impl Property {
         let mut hasher = sha2::Sha256::default();
         hasher.update(SALT);
         match self {
+            Property::Bool(data) => hasher.update([*data as u8]),
             Property::Integer(data) => hasher.update(data.to_le_bytes()),
             Property::Float(data) => hasher.update(data.to_le_bytes()),
             Property::String(data) => hasher.update(data),
-            Property::Bool(data) => hasher.update([*data as u8]),
         }
-        format!("{:x}", hasher.finalize()).into()
+        Self::String(format!("{:x}", hasher.finalize()))
+    }
+}
+
+impl From<bool> for Property {
+    #[inline]
+    fn from(value: bool) -> Self {
+        Self::Bool(value)
+    }
+}
+
+impl From<i64> for Property {
+    #[inline]
+    fn from(value: i64) -> Self {
+        Self::Integer(value)
+    }
+}
+
+impl From<f64> for Property {
+    #[inline]
+    fn from(value: f64) -> Self {
+        Self::Float(value)
+    }
+}
+
+impl From<String> for Property {
+    #[inline]
+    fn from(value: String) -> Self {
+        Self::String(value)
     }
 }
 

crates/re_format/Cargo.toml

@@ -19,4 +19,3 @@ all-features = true
 [dependencies]
 arrow2.workspace = true
 comfy-table.workspace = true
-derive_more.workspace = true

crates/re_format/src/arrow.rs

@@ -40,7 +40,6 @@ impl std::fmt::Display for DisplayIntervalUnit {
 }
 
 //TODO(john) move this and the Display impl upstream into arrow2
-#[derive(derive_more::From, derive_more::Into)]
 #[repr(transparent)]
 pub struct DisplayDataType(DataType);
 

crates/re_log_types/Cargo.toml

@@ -66,7 +66,6 @@ chrono = { workspace = true, features = [
   "js-sys",
   "wasmbind",
 ] } # TODO(emilk): replace `chrono` with `time` crate
-derive_more.workspace = true
 document-features = "0.2"
 fixed = { version = "1.17", default-features = false, features = ["serde"] }
 half = { workspace = true, features = ["bytemuck"] }

crates/re_log_types/src/component_types/color.rs

@@ -11,18 +11,7 @@ use crate::msg_bundle::Component;
 ///
 /// assert_eq!(ColorRGBA::data_type(), DataType::UInt32);
 /// ```
-#[derive(
-    Clone,
-    Copy,
-    Debug,
-    PartialEq,
-    Eq,
-    derive_more::From,
-    derive_more::Into,
-    ArrowField,
-    ArrowSerialize,
-    ArrowDeserialize,
-)]
+#[derive(Clone, Copy, Debug, PartialEq, Eq, ArrowField, ArrowSerialize, ArrowDeserialize)]
 #[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
 #[arrow_field(transparent)]
 pub struct ColorRGBA(pub u32);

crates/re_log_types/src/component_types/label.rs

@@ -11,17 +11,7 @@ use crate::msg_bundle::Component;
 ///
 /// assert_eq!(Label::data_type(), DataType::Utf8);
 /// ```
-#[derive(
-    Debug,
-    Clone,
-    PartialEq,
-    Eq,
-    derive_more::From,
-    derive_more::Into,
-    ArrowField,
-    ArrowSerialize,
-    ArrowDeserialize,
-)]
+#[derive(Debug, Clone, PartialEq, Eq, ArrowField, ArrowSerialize, ArrowDeserialize)]
 #[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
 #[arrow_field(transparent)]
 pub struct Label(pub String);
@@ -32,3 +22,17 @@ impl Component for Label {
         "rerun.label".into()
     }
 }
+
+impl From<String> for Label {
+    #[inline]
+    fn from(value: String) -> Self {
+        Self(value)
+    }
+}
+
+impl From<Label> for String {
+    #[inline]
+    fn from(value: Label) -> Self {
+        value.0
+    }
+}

crates/re_log_types/src/component_types/radius.rs

@@ -12,16 +12,7 @@ use crate::msg_bundle::Component;
 /// # use arrow2::datatypes::{DataType, Field};
 /// assert_eq!(Radius::data_type(), DataType::Float32);
 /// ```
-#[derive(
-    Debug,
-    Clone,
-    Copy,
-    derive_more::From,
-    derive_more::Into,
-    ArrowField,
-    ArrowSerialize,
-    ArrowDeserialize,
-)]
+#[derive(Debug, Clone, Copy, ArrowField, ArrowSerialize, ArrowDeserialize)]
 #[arrow_field(transparent)]
 pub struct Radius(pub f32);
 

crates/re_log_types/src/component_types/scalar.rs

@@ -14,16 +14,7 @@ use crate::msg_bundle::Component;
 /// # use arrow2::datatypes::{DataType, Field};
 /// assert_eq!(Scalar::data_type(), DataType::Float64);
 /// ```
-#[derive(
-    Debug,
-    Clone,
-    Copy,
-    derive_more::From,
-    derive_more::Into,
-    ArrowField,
-    ArrowSerialize,
-    ArrowDeserialize,
-)]
+#[derive(Debug, Clone, Copy, ArrowField, ArrowSerialize, ArrowDeserialize)]
 #[arrow_field(transparent)]
 pub struct Scalar(pub f64);
 
@@ -34,6 +25,20 @@ impl Component for Scalar {
     }
 }
 
+impl From<f64> for Scalar {
+    #[inline]
+    fn from(value: f64) -> Self {
+        Self(value)
+    }
+}
+
+impl From<Scalar> for f64 {
+    #[inline]
+    fn from(value: Scalar) -> Self {
+        value.0
+    }
+}
+
 // ---
 
 /// Additional properties of a scalar when rendered as a plot.

crates/re_log_types/src/lib.rs

@@ -121,7 +121,7 @@ impl std::str::FromStr for RecordingId {
 /// The user-chosen name of the application doing the logging.
 ///
 /// Used to categorize recordings.
-#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash, derive_more::Display)]
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Hash)]
 #[cfg_attr(feature = "serde", derive(serde::Deserialize, serde::Serialize))]
 pub struct ApplicationId(pub String);
 
@@ -146,6 +146,13 @@ impl ApplicationId {
     }
 }
 
+impl std::fmt::Display for ApplicationId {
+    #[inline]
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        self.0.fmt(f)
+    }
+}
+
 // ----------------------------------------------------------------------------
 
 /// The most general log message sent from the SDK to the server.

crates/re_viewer/src/ui/view_time_series/scene.rs

@@ -126,7 +126,7 @@ impl SceneTimeSeries {
                             attrs: PlotPointAttrs {
                                 label,
                                 color,
-                                radius: radius.map_or(DEFAULT_RADIUS, |r| r.into()),
+                                radius: radius.map_or(DEFAULT_RADIUS, |r| r.0),
                                 scattered: props.map_or(false, |props| props.scattered),
                             },
                         });

deny.toml

@@ -31,6 +31,7 @@ wildcards = "allow" # at least until https://github.com/EmbarkStudios/cargo-deny
 deny = [
   { name = "cgmath" },      # We use glam
   { name = "cmake" },       # Never again
+  { name = "derive_more" }, # Is very slow to compile; see https://github.com/rerun-io/rerun/issues/1316
   { name = "egui_glow" },   # We use wgpu
   { name = "openssl-sys" }, # We prefer rustls
   { name = "openssl" },     # We prefer rustls