Use shared tree display extractor for plans

Signed-off-by: Joe Isaacs <joe.isaacs@live.co.uk>

Author: joseph-isaacs

vortex-layout/src/plan/display.rs

@@ -6,35 +6,11 @@ use std::fmt;
 pub use vortex_utils::tree::DepthContext as PlanTreeContext;
 pub use vortex_utils::tree::IndentedFormatter as PlanIndentedFormatter;
 use vortex_utils::tree::TreeDisplayAdapter;
+pub use vortex_utils::tree::TreeDisplayExtractor as PlanTreeExtractor;
 use vortex_utils::tree::write_indented_tree;
 
 use super::DynPlan;
 
-/// Contributes one composable dimension of information to plan tree nodes.
-pub trait PlanTreeExtractor: Send + Sync {
-    /// Writes space-prefixed annotations on the node's header line.
-    fn write_header(
-        &self,
-        plan: &dyn DynPlan,
-        context: &PlanTreeContext,
-        formatter: &mut fmt::Formatter<'_>,
-    ) -> fmt::Result {
-        let _ = (plan, context, formatter);
-        Ok(())
-    }
-
-    /// Writes detail lines beneath the node's header.
-    fn write_details(
-        &self,
-        plan: &dyn DynPlan,
-        context: &PlanTreeContext,
-        formatter: &mut PlanIndentedFormatter<'_, '_>,
-    ) -> fmt::Result {
-        let _ = (plan, context, formatter);
-        Ok(())
-    }
-}
-
 /// Adds the plan's display representation to a tree node's header.
 pub struct PlanSummaryExtractor;
 
@@ -45,7 +21,7 @@ impl PlanSummaryExtractor {
     }
 }
 
-impl PlanTreeExtractor for PlanSummaryExtractor {
+impl PlanTreeExtractor<dyn DynPlan, PlanTreeContext> for PlanSummaryExtractor {
     fn write_header(
         &self,
         plan: &dyn DynPlan,
@@ -63,7 +39,7 @@ impl PlanTreeExtractor for PlanSummaryExtractor {
 /// start with only node and child names, then add extractors with [`Self::with`].
 pub struct PlanTreeDisplay<'a> {
     plan: &'a dyn DynPlan,
-    extractors: Vec<Box<dyn PlanTreeExtractor>>,
+    extractors: Vec<Box<dyn PlanTreeExtractor<dyn DynPlan, PlanTreeContext>>>,
 }
 
 impl<'a> PlanTreeDisplay<'a> {
@@ -81,13 +57,19 @@ impl<'a> PlanTreeDisplay<'a> {
     }
 
     /// Adds an extractor to the display pipeline.
-    pub fn with<E: PlanTreeExtractor + 'static>(mut self, extractor: E) -> Self {
+    pub fn with<E: PlanTreeExtractor<dyn DynPlan, PlanTreeContext> + 'static>(
+        mut self,
+        extractor: E,
+    ) -> Self {
         self.extractors.push(Box::new(extractor));
         self
     }
 
     /// Adds a pre-boxed extractor to the display pipeline.
-    pub fn with_boxed(mut self, extractor: Box<dyn PlanTreeExtractor>) -> Self {
+    pub fn with_boxed(
+        mut self,
+        extractor: Box<dyn PlanTreeExtractor<dyn DynPlan, PlanTreeContext>>,
+    ) -> Self {
         self.extractors.push(extractor);
         self
     }

vortex-layout/src/plan/tests.rs

@@ -369,7 +369,7 @@ fn plan_display_matches_array_tree_display_shape() -> VortexResult<()> {
 
     struct DepthExtractor;
 
-    impl PlanTreeExtractor for DepthExtractor {
+    impl PlanTreeExtractor<dyn DynPlan, PlanTreeContext> for DepthExtractor {
         fn write_header(
             &self,
             _plan: &dyn DynPlan,