From 2d2daf1461de1207fe9012e524d99b6d61d6b84d Mon Sep 17 00:00:00 2001
From: Clement Rey <cr.rey.clement@gmail.com>
Date: Fri, 23 Aug 2024 12:18:08 +0200
Subject: [PATCH 1/2] remove Datatype and DatatypeBatch

---
 crates/store/re_types_core/src/lib.rs         |  4 +--
 crates/store/re_types_core/src/loggable.rs    | 10 +------
 .../store/re_types_core/src/loggable_batch.rs | 28 +------------------
 crates/top/re_sdk/src/lib.rs                  |  6 ++--
 4 files changed, 7 insertions(+), 41 deletions(-)

diff --git a/crates/store/re_types_core/src/lib.rs b/crates/store/re_types_core/src/lib.rs
index bf3145ca491d..a0ab5489cb28 100644
--- a/crates/store/re_types_core/src/lib.rs
+++ b/crates/store/re_types_core/src/lib.rs
@@ -95,8 +95,8 @@ pub use self::{
     },
     arrow_buffer::ArrowBuffer,
     arrow_string::ArrowString,
-    loggable::{Component, ComponentName, ComponentNameSet, Datatype, DatatypeName, Loggable},
-    loggable_batch::{ComponentBatch, DatatypeBatch, LoggableBatch, MaybeOwnedComponentBatch},
+    loggable::{Component, ComponentName, ComponentNameSet, DatatypeName, Loggable},
+    loggable_batch::{ComponentBatch, LoggableBatch, MaybeOwnedComponentBatch},
     result::{
         DeserializationError, DeserializationResult, ResultExt, SerializationError,
         SerializationResult, _Backtrace,
diff --git a/crates/store/re_types_core/src/loggable.rs b/crates/store/re_types_core/src/loggable.rs
index 8f4871fe5bfb..b3a501b997fc 100644
--- a/crates/store/re_types_core/src/loggable.rs
+++ b/crates/store/re_types_core/src/loggable.rs
@@ -5,7 +5,7 @@ use crate::{
 };
 
 #[allow(unused_imports)] // used in docstrings
-use crate::{Archetype, ComponentBatch, DatatypeBatch, LoggableBatch};
+use crate::{Archetype, ComponentBatch, LoggableBatch};
 
 // ---
 
@@ -127,14 +127,6 @@ pub trait Loggable: 'static + Send + Sync + Clone + Sized + SizeBytes {
     }
 }
 
-/// A [`Datatype`] describes plain old data that can be used by any number of [`Component`]s.
-///
-/// Any [`Loggable`] with a [`Loggable::Name`] set to [`DatatypeName`] automatically implements
-/// [`Datatype`].
-pub trait Datatype: Loggable<Name = DatatypeName> {}
-
-impl<L: Loggable<Name = DatatypeName>> Datatype for L {}
-
 /// A [`Component`] describes semantic data that can be used by any number of [`Archetype`]s.
 ///
 /// Any [`Loggable`] with a [`Loggable::Name`] set to [`ComponentName`] automatically implements
diff --git a/crates/store/re_types_core/src/loggable_batch.rs b/crates/store/re_types_core/src/loggable_batch.rs
index 46f34f177166..d7a9d6b5e2b2 100644
--- a/crates/store/re_types_core/src/loggable_batch.rs
+++ b/crates/store/re_types_core/src/loggable_batch.rs
@@ -1,4 +1,4 @@
-use crate::{Component, ComponentName, Datatype, DatatypeName, Loggable, SerializationResult};
+use crate::{Component, ComponentName, Loggable, SerializationResult};
 
 #[allow(unused_imports)] // used in docstrings
 use crate::Archetype;
@@ -34,12 +34,6 @@ pub trait LoggableBatch {
     fn to_arrow(&self) -> SerializationResult<Box<dyn ::arrow2::array::Array>>;
 }
 
-/// A [`DatatypeBatch`] represents an array's worth of [`Datatype`] instances.
-///
-/// Any [`LoggableBatch`] with a [`Loggable::Name`] set to [`DatatypeName`] automatically
-/// implements [`DatatypeBatch`].
-pub trait DatatypeBatch: LoggableBatch<Name = DatatypeName> {}
-
 /// A [`ComponentBatch`] represents an array's worth of [`Component`] instances.
 ///
 /// Any [`LoggableBatch`] with a [`Loggable::Name`] set to [`ComponentName`] automatically
@@ -143,8 +137,6 @@ impl<L: Clone + Loggable> LoggableBatch for L {
     }
 }
 
-impl<D: Datatype> DatatypeBatch for D {}
-
 impl<C: Component> ComponentBatch for C {}
 
 // --- Unary Option ---
@@ -173,8 +165,6 @@ impl<L: Clone + Loggable> LoggableBatch for Option<L> {
     }
 }
 
-impl<D: Datatype> DatatypeBatch for Option<D> {}
-
 impl<C: Component> ComponentBatch for Option<C> {}
 
 // --- Vec ---
@@ -203,8 +193,6 @@ impl<L: Clone + Loggable> LoggableBatch for Vec<L> {
     }
 }
 
-impl<D: Datatype> DatatypeBatch for Vec<D> {}
-
 impl<C: Component> ComponentBatch for Vec<C> {}
 
 // --- Vec<Option> ---
@@ -236,8 +224,6 @@ impl<L: Loggable> LoggableBatch for Vec<Option<L>> {
     }
 }
 
-impl<D: Datatype> DatatypeBatch for Vec<Option<D>> {}
-
 impl<C: Component> ComponentBatch for Vec<Option<C>> {}
 
 // --- Array ---
@@ -266,8 +252,6 @@ impl<L: Loggable, const N: usize> LoggableBatch for [L; N] {
     }
 }
 
-impl<D: Datatype, const N: usize> DatatypeBatch for [D; N] {}
-
 impl<C: Component, const N: usize> ComponentBatch for [C; N] {}
 
 // --- Array<Option> ---
@@ -299,8 +283,6 @@ impl<L: Loggable, const N: usize> LoggableBatch for [Option<L>; N] {
     }
 }
 
-impl<D: Datatype, const N: usize> DatatypeBatch for [Option<D>; N] {}
-
 impl<C: Component, const N: usize> ComponentBatch for [Option<C>; N] {}
 
 // --- Slice ---
@@ -329,8 +311,6 @@ impl<'a, L: Loggable> LoggableBatch for &'a [L] {
     }
 }
 
-impl<'a, D: Datatype> DatatypeBatch for &'a [D] {}
-
 impl<'a, C: Component> ComponentBatch for &'a [C] {}
 
 // --- Slice<Option> ---
@@ -362,8 +342,6 @@ impl<'a, L: Loggable> LoggableBatch for &'a [Option<L>] {
     }
 }
 
-impl<'a, D: Datatype> DatatypeBatch for &'a [Option<D>] {}
-
 impl<'a, C: Component> ComponentBatch for &'a [Option<C>] {}
 
 // --- ArrayRef ---
@@ -392,8 +370,6 @@ impl<'a, L: Loggable, const N: usize> LoggableBatch for &'a [L; N] {
     }
 }
 
-impl<'a, D: Datatype, const N: usize> DatatypeBatch for &'a [D; N] {}
-
 impl<'a, C: Component, const N: usize> ComponentBatch for &'a [C; N] {}
 
 // --- ArrayRef<Option> ---
@@ -425,6 +401,4 @@ impl<'a, L: Loggable, const N: usize> LoggableBatch for &'a [Option<L>; N] {
     }
 }
 
-impl<'a, D: Datatype, const N: usize> DatatypeBatch for &'a [Option<D>; N] {}
-
 impl<'a, C: Component, const N: usize> ComponentBatch for &'a [Option<C>; N] {}
diff --git a/crates/top/re_sdk/src/lib.rs b/crates/top/re_sdk/src/lib.rs
index 8bb43a4b042a..49766d057442 100644
--- a/crates/top/re_sdk/src/lib.rs
+++ b/crates/top/re_sdk/src/lib.rs
@@ -90,9 +90,9 @@ pub mod time {
 pub use time::{Time, TimePoint, Timeline};
 
 pub use re_types_core::{
-    Archetype, ArchetypeName, AsComponents, Component, ComponentBatch, ComponentName, Datatype,
-    DatatypeBatch, DatatypeName, GenericIndicatorComponent, Loggable, LoggableBatch,
-    MaybeOwnedComponentBatch, NamedIndicatorComponent, SizeBytes,
+    Archetype, ArchetypeName, AsComponents, Component, ComponentBatch, ComponentName, DatatypeName,
+    GenericIndicatorComponent, Loggable, LoggableBatch, MaybeOwnedComponentBatch,
+    NamedIndicatorComponent, SizeBytes,
 };
 
 #[cfg(feature = "data_loaders")]

From b18f28631c1b4fa533f3d9de529f6addfb66165d Mon Sep 17 00:00:00 2001
From: Clement Rey <cr.rey.clement@gmail.com>
Date: Fri, 23 Aug 2024 12:27:53 +0200
Subject: [PATCH 2/2] update docs

---
 crates/store/re_types/src/lib.rs           |  2 +-
 crates/store/re_types_core/src/lib.rs      |  4 ++--
 crates/store/re_types_core/src/loggable.rs | 11 +++++------
 docs/snippets/all/tutorials/custom_data.rs |  2 +-
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/crates/store/re_types/src/lib.rs b/crates/store/re_types/src/lib.rs
index 97fd657e0949..be1e099670d1 100644
--- a/crates/store/re_types/src/lib.rs
+++ b/crates/store/re_types/src/lib.rs
@@ -227,7 +227,7 @@ pub mod components {
 
 /// The low-level datatypes that [`components`] are built from.
 ///
-/// They all implement the [`Datatype`] trait.
+/// They all implement the [`Loggable`] trait.
 pub mod datatypes {
 
     // Some datatypes are so fundamental and used everywhere that we want them to be exposed
diff --git a/crates/store/re_types_core/src/lib.rs b/crates/store/re_types_core/src/lib.rs
index a0ab5489cb28..86fa6374cf42 100644
--- a/crates/store/re_types_core/src/lib.rs
+++ b/crates/store/re_types_core/src/lib.rs
@@ -9,7 +9,7 @@
 //! When multiple instances of a [`Component`] are put together in an array, they yield a
 //! [`ComponentBatch`]: the atomic unit of (de)serialization.
 //!
-//! Internally, [`Component`]s are implemented using many different [`Datatype`]s.
+//! Internally, [`Component`]s are implemented using many different [`Loggable`]s.
 //!
 //! ## Feature flags
 #![doc = document_features::document_features!()]
@@ -117,7 +117,7 @@ pub mod archetypes;
 /// There are also re-exported by `re_types`.
 pub mod components;
 
-/// Fundamental [`Datatype`]s that are implemented in `re_types_core` directly for convenience and
+/// Fundamental datatypes that are implemented in `re_types_core` directly for convenience and
 /// dependency optimization.
 ///
 /// There are also re-exported by `re_types`.
diff --git a/crates/store/re_types_core/src/loggable.rs b/crates/store/re_types_core/src/loggable.rs
index b3a501b997fc..cd84f6d9ca56 100644
--- a/crates/store/re_types_core/src/loggable.rs
+++ b/crates/store/re_types_core/src/loggable.rs
@@ -14,13 +14,12 @@ use crate::{Archetype, ComponentBatch, LoggableBatch};
 /// Internally, Arrow, and by extension Rerun, only deal with arrays of data.
 /// We refer to individual entries in these arrays as instances.
 ///
-/// [`Datatype`] and [`Component`] are specialization of the [`Loggable`] trait that are
-/// automatically implemented based on the type used for [`Loggable::Name`].
+/// [`Component`] is a specialization of the [`Loggable`] trait where [`Loggable::Name`] ==
+/// [`ComponentName`].
 ///
-/// Implementing the [`Loggable`] trait (and by extension [`Datatype`]/[`Component`])
-/// automatically derives the [`LoggableBatch`] implementation (and by extension
-/// [`DatatypeBatch`]/[`ComponentBatch`]), which makes it possible to work with lists' worth of data
-/// in a generic fashion.
+/// Implementing the [`Loggable`] trait (and by extension [`Component`]) automatically derives the
+/// [`LoggableBatch`] implementation (and by extension [`ComponentBatch`]), which makes it possible to
+/// work with lists' worth of data in a generic fashion.
 pub trait Loggable: 'static + Send + Sync + Clone + Sized + SizeBytes {
     type Name: std::fmt::Display;
 
diff --git a/docs/snippets/all/tutorials/custom_data.rs b/docs/snippets/all/tutorials/custom_data.rs
index 5672f5da6480..738b5da262f8 100644
--- a/docs/snippets/all/tutorials/custom_data.rs
+++ b/docs/snippets/all/tutorials/custom_data.rs
@@ -38,7 +38,7 @@ impl rerun::AsComponents for CustomPoints3D {
 
 // ---
 
-/// A custom [`rerun::Component`] that is backed by a builtin [`rerun::Float32`] scalar [`rerun::Datatype`].
+/// A custom [`rerun::Component`] that is backed by a builtin [`rerun::Float32`] scalar.
 #[derive(Debug, Clone, Copy)]
 struct Confidence(rerun::Float32);