reformat

thomasp85 · thomasp85 · commit 9b696fd7fb05 · 2026-03-20T12:21:23.000+01:00
diff --git a/src/plot/facet/types.rs b/src/plot/facet/types.rs
@@ -2,7 +2,7 @@
 //!
 //! This module defines faceting configuration for small multiples.
 
-use crate::plot::types::{ParamConstraint, ParamDefinition, DefaultParamValue};
+use crate::plot::types::{DefaultParamValue, ParamConstraint, ParamDefinition};
 use crate::plot::ParameterValue;
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
diff --git a/src/plot/layer/geom/area.rs b/src/plot/layer/geom/area.rs
@@ -2,7 +2,7 @@
 
 use crate::plot::layer::orientation::{ALIGNED, ORIENTATION_VALUES};
 use crate::plot::types::DefaultAestheticValue;
-use crate::plot::{ParamDefinition, DefaultParamValue};
+use crate::plot::{DefaultParamValue, ParamDefinition};
 use crate::{naming, Mappings};
 
 use super::types::{ParamConstraint, POSITION_VALUES};
diff --git a/src/plot/layer/geom/arrow.rs b/src/plot/layer/geom/arrow.rs
@@ -2,7 +2,7 @@
 
 use super::types::POSITION_VALUES;
 use super::{
-    DefaultAesthetics, GeomTrait, GeomType, ParamConstraint, ParamDefinition, DefaultParamValue,
+    DefaultAesthetics, DefaultParamValue, GeomTrait, GeomType, ParamConstraint, ParamDefinition,
 };
 use crate::plot::types::DefaultAestheticValue;
 
diff --git a/src/plot/layer/geom/bar.rs b/src/plot/layer/geom/bar.rs
@@ -5,7 +5,7 @@ use std::collections::HashSet;
 
 use super::types::{get_column_name, POSITION_VALUES};
 use super::{
-    DefaultAesthetics, GeomTrait, GeomType, ParamConstraint, ParamDefinition, DefaultParamValue,
+    DefaultAesthetics, DefaultParamValue, GeomTrait, GeomType, ParamConstraint, ParamDefinition,
     StatResult,
 };
 use crate::naming;
diff --git a/src/plot/layer/geom/boxplot.rs b/src/plot/layer/geom/boxplot.rs
@@ -7,8 +7,8 @@ use super::{DefaultAesthetics, GeomTrait, GeomType};
 use crate::{
     naming,
     plot::{
-        geom::types::get_column_name, DefaultAestheticValue, ParamConstraint, ParamDefinition,
-        DefaultParamValue, ParameterValue, StatResult,
+        geom::types::get_column_name, DefaultAestheticValue, DefaultParamValue, ParamConstraint,
+        ParamDefinition, ParameterValue, StatResult,
     },
     reader::SqlDialect,
     DataFrame, GgsqlError, Mappings, Result,
@@ -496,7 +496,6 @@ mod tests {
         assert!(outlier_section.contains("raw.year = summary.year"));
     }
 
-
     // ==================== GeomTrait Implementation Tests ====================
 
     #[test]
diff --git a/src/plot/layer/geom/density.rs b/src/plot/layer/geom/density.rs
@@ -5,8 +5,8 @@ use super::{DefaultAesthetics, GeomTrait, GeomType};
 use crate::{
     naming,
     plot::{
-        geom::types::get_column_name, DefaultAestheticValue, ParamConstraint, ParamDefinition,
-        DefaultParamValue, ParameterValue, StatResult,
+        geom::types::get_column_name, DefaultAestheticValue, DefaultParamValue, ParamConstraint,
+        ParamDefinition, ParameterValue, StatResult,
     },
     reader::SqlDialect,
     GgsqlError, Mappings, Result,
diff --git a/src/plot/layer/geom/errorbar.rs b/src/plot/layer/geom/errorbar.rs
@@ -2,7 +2,7 @@
 
 use super::types::POSITION_VALUES;
 use super::{
-    DefaultAesthetics, GeomTrait, GeomType, ParamConstraint, ParamDefinition, DefaultParamValue,
+    DefaultAesthetics, DefaultParamValue, GeomTrait, GeomType, ParamConstraint, ParamDefinition,
 };
 use crate::plot::types::DefaultAestheticValue;
 
diff --git a/src/plot/layer/geom/histogram.rs b/src/plot/layer/geom/histogram.rs
@@ -4,7 +4,7 @@ use std::collections::HashMap;
 
 use super::types::{get_column_name, CLOSED_VALUES, POSITION_VALUES};
 use super::{
-    DefaultAesthetics, GeomTrait, GeomType, ParamConstraint, ParamDefinition, DefaultParamValue,
+    DefaultAesthetics, DefaultParamValue, GeomTrait, GeomType, ParamConstraint, ParamDefinition,
     StatResult,
 };
 use crate::naming;
diff --git a/src/plot/layer/geom/line.rs b/src/plot/layer/geom/line.rs
@@ -1,7 +1,7 @@
 //! Line geom implementation
 
 use super::{
-    DefaultAesthetics, GeomTrait, GeomType, ParamConstraint, ParamDefinition, DefaultParamValue,
+    DefaultAesthetics, DefaultParamValue, GeomTrait, GeomType, ParamConstraint, ParamDefinition,
     StatResult,
 };
 use crate::plot::layer::orientation::{ALIGNED, ORIENTATION_VALUES};
diff --git a/src/plot/layer/geom/linear.rs b/src/plot/layer/geom/linear.rs
@@ -1,7 +1,7 @@
 //! Linear geom implementation
 
 use super::{
-    DefaultAesthetics, GeomTrait, GeomType, ParamConstraint, ParamDefinition, DefaultParamValue,
+    DefaultAesthetics, DefaultParamValue, GeomTrait, GeomType, ParamConstraint, ParamDefinition,
 };
 use crate::plot::layer::orientation::{ALIGNED, ORIENTATION_VALUES};
 use crate::plot::types::DefaultAestheticValue;
diff --git a/src/plot/layer/geom/mod.rs b/src/plot/layer/geom/mod.rs
@@ -50,7 +50,7 @@ mod violin;
 
 // Re-export types
 pub use types::{
-    DefaultAesthetics, ParamConstraint, ParamDefinition, DefaultParamValue, StatResult,
+    DefaultAesthetics, DefaultParamValue, ParamConstraint, ParamDefinition, StatResult,
 };
 
 // Re-export geom structs for direct access if needed
diff --git a/src/plot/layer/geom/path.rs b/src/plot/layer/geom/path.rs
@@ -2,7 +2,7 @@
 
 use super::types::POSITION_VALUES;
 use super::{
-    DefaultAesthetics, GeomTrait, GeomType, ParamConstraint, ParamDefinition, DefaultParamValue,
+    DefaultAesthetics, DefaultParamValue, GeomTrait, GeomType, ParamConstraint, ParamDefinition,
 };
 use crate::plot::types::DefaultAestheticValue;
 
diff --git a/src/plot/layer/geom/point.rs b/src/plot/layer/geom/point.rs
@@ -2,7 +2,7 @@
 
 use super::types::POSITION_VALUES;
 use super::{
-    DefaultAesthetics, GeomTrait, GeomType, ParamConstraint, ParamDefinition, DefaultParamValue,
+    DefaultAesthetics, DefaultParamValue, GeomTrait, GeomType, ParamConstraint, ParamDefinition,
 };
 use crate::plot::types::DefaultAestheticValue;
 
diff --git a/src/plot/layer/geom/polygon.rs b/src/plot/layer/geom/polygon.rs
@@ -2,7 +2,7 @@
 
 use super::types::POSITION_VALUES;
 use super::{
-    DefaultAesthetics, GeomTrait, GeomType, ParamConstraint, ParamDefinition, DefaultParamValue,
+    DefaultAesthetics, DefaultParamValue, GeomTrait, GeomType, ParamConstraint, ParamDefinition,
 };
 use crate::plot::types::DefaultAestheticValue;
 
diff --git a/src/plot/layer/geom/rect.rs b/src/plot/layer/geom/rect.rs
@@ -7,7 +7,7 @@ use super::types::POSITION_VALUES;
 use super::{DefaultAesthetics, GeomTrait, GeomType, ParamConstraint, StatResult};
 use crate::naming;
 use crate::plot::types::{DefaultAestheticValue, ParameterValue};
-use crate::plot::{ParamDefinition, DefaultParamValue};
+use crate::plot::{DefaultParamValue, ParamDefinition};
 use crate::{DataFrame, GgsqlError, Mappings, Result};
 
 use super::types::Schema;
diff --git a/src/plot/layer/geom/ribbon.rs b/src/plot/layer/geom/ribbon.rs
@@ -3,7 +3,7 @@
 use super::types::POSITION_VALUES;
 use super::{DefaultAesthetics, GeomTrait, GeomType, StatResult};
 use crate::plot::types::DefaultAestheticValue;
-use crate::plot::{ParamConstraint, ParamDefinition, DefaultParamValue};
+use crate::plot::{DefaultParamValue, ParamConstraint, ParamDefinition};
 use crate::{naming, Mappings};
 
 /// Ribbon geom - confidence bands and ranges
diff --git a/src/plot/layer/geom/segment.rs b/src/plot/layer/geom/segment.rs
@@ -2,7 +2,7 @@
 
 use super::types::POSITION_VALUES;
 use super::{
-    DefaultAesthetics, GeomTrait, GeomType, ParamConstraint, ParamDefinition, DefaultParamValue,
+    DefaultAesthetics, DefaultParamValue, GeomTrait, GeomType, ParamConstraint, ParamDefinition,
 };
 use crate::plot::types::DefaultAestheticValue;
 
diff --git a/src/plot/layer/geom/smooth.rs b/src/plot/layer/geom/smooth.rs
@@ -2,7 +2,7 @@
 
 use super::types::POSITION_VALUES;
 use super::{
-    DefaultAesthetics, GeomTrait, GeomType, ParamConstraint, ParamDefinition, DefaultParamValue,
+    DefaultAesthetics, DefaultParamValue, GeomTrait, GeomType, ParamConstraint, ParamDefinition,
 };
 use crate::plot::geom::types::get_column_name;
 use crate::plot::types::DefaultAestheticValue;
diff --git a/src/plot/layer/geom/text.rs b/src/plot/layer/geom/text.rs
@@ -2,7 +2,7 @@
 
 use super::types::POSITION_VALUES;
 use super::{
-    DefaultAesthetics, GeomTrait, GeomType, ParamConstraint, ParamDefinition, DefaultParamValue,
+    DefaultAesthetics, DefaultParamValue, GeomTrait, GeomType, ParamConstraint, ParamDefinition,
     ParameterValue,
 };
 use crate::plot::types::DefaultAestheticValue;
diff --git a/src/plot/layer/geom/types.rs b/src/plot/layer/geom/types.rs
@@ -6,7 +6,7 @@ use crate::plot::aesthetic::parse_positional;
 use crate::{plot::types::DefaultAestheticValue, Mappings};
 
 // Re-export shared types from the central location
-pub use crate::plot::types::{ParamConstraint, ParamDefinition, DefaultParamValue};
+pub use crate::plot::types::{DefaultParamValue, ParamConstraint, ParamDefinition};
 
 // =============================================================================
 // Common constraint value arrays
diff --git a/src/plot/layer/geom/violin.rs b/src/plot/layer/geom/violin.rs
@@ -5,8 +5,8 @@ use super::{DefaultAesthetics, GeomTrait, GeomType, StatResult};
 use crate::{
     naming,
     plot::{
-        geom::types::get_column_name, DefaultAestheticValue, ParamConstraint, ParamDefinition,
-        DefaultParamValue, ParameterValue,
+        geom::types::get_column_name, DefaultAestheticValue, DefaultParamValue, ParamConstraint,
+        ParamDefinition, ParameterValue,
     },
     DataFrame, GgsqlError, Mappings, Result,
 };
diff --git a/src/plot/layer/mod.rs b/src/plot/layer/mod.rs
@@ -20,7 +20,7 @@ pub use orientation::is_transposed;
 
 // Re-export geom types for convenience
 pub use geom::{
-    DefaultAesthetics, Geom, GeomTrait, GeomType, ParamDefinition, DefaultParamValue, StatResult,
+    DefaultAesthetics, DefaultParamValue, Geom, GeomTrait, GeomType, ParamDefinition, StatResult,
 };
 
 // Re-export position types for convenience
diff --git a/src/plot/layer/position/dodge.rs b/src/plot/layer/position/dodge.rs
@@ -7,7 +7,7 @@
 //! - If both are discrete → 2D grid dodge (both offsets, arranged in a grid)
 
 use super::{compute_dodge_offsets, is_continuous_scale, Layer, PositionTrait, PositionType};
-use crate::plot::types::{ParamConstraint, ParamDefinition, DefaultParamValue, ParameterValue};
+use crate::plot::types::{DefaultParamValue, ParamConstraint, ParamDefinition, ParameterValue};
 use crate::{naming, DataFrame, GgsqlError, Plot, Result};
 use polars::prelude::*;
 use std::collections::HashMap;
@@ -636,9 +636,6 @@ mod tests {
         let params = dodge.default_params();
         assert_eq!(params.len(), 1);
         assert_eq!(params[0].name, "width");
-        assert!(matches!(
-            params[0].default,
-            DefaultParamValue::Number(0.9)
-        ));
+        assert!(matches!(params[0].default, DefaultParamValue::Number(0.9)));
     }
 }
diff --git a/src/plot/layer/position/jitter.rs b/src/plot/layer/position/jitter.rs
@@ -18,7 +18,7 @@ use super::{
     compute_dodge_offsets, compute_group_indices, is_continuous_scale, Layer, PositionTrait,
     PositionType,
 };
-use crate::plot::types::{ParamConstraint, ParamDefinition, DefaultParamValue, ParameterValue};
+use crate::plot::types::{DefaultParamValue, ParamConstraint, ParamDefinition, ParameterValue};
 use crate::{naming, DataFrame, GgsqlError, Plot, Result};
 use polars::prelude::*;
 use rand::Rng;
@@ -996,10 +996,7 @@ mod tests {
         let params = jitter.default_params();
         assert_eq!(params.len(), 5);
         assert_eq!(params[0].name, "width");
-        assert!(matches!(
-            params[0].default,
-            DefaultParamValue::Number(0.9)
-        ));
+        assert!(matches!(params[0].default, DefaultParamValue::Number(0.9)));
         assert_eq!(params[1].name, "dodge");
         assert!(matches!(
             params[1].default,
@@ -1014,10 +1011,7 @@ mod tests {
         assert_eq!(params[3].name, "bandwidth");
         assert!(matches!(params[3].default, DefaultParamValue::Null));
         assert_eq!(params[4].name, "adjust");
-        assert!(matches!(
-            params[4].default,
-            DefaultParamValue::Number(1.0)
-        ));
+        assert!(matches!(params[4].default, DefaultParamValue::Number(1.0)));
     }
 
     #[test]
diff --git a/src/plot/layer/position/mod.rs b/src/plot/layer/position/mod.rs
@@ -14,7 +14,7 @@ mod identity;
 mod jitter;
 mod stack;
 
-use crate::plot::types::{ParamDefinition, DefaultParamValue, ParameterValue};
+use crate::plot::types::{DefaultParamValue, ParamDefinition, ParameterValue};
 use crate::plot::ScaleTypeKind;
 use crate::{DataFrame, Plot, Result};
 use serde::{Deserialize, Serialize};
diff --git a/src/plot/layer/position/stack.rs b/src/plot/layer/position/stack.rs
@@ -7,7 +7,7 @@
 //! - If pos1 is continuous and pos2 is discrete → stack horizontally (modify pos1/pos1end)
 
 use super::{is_continuous_scale, Layer, PositionTrait, PositionType};
-use crate::plot::types::{ParamConstraint, ParamDefinition, DefaultParamValue, ParameterValue};
+use crate::plot::types::{DefaultParamValue, ParamConstraint, ParamDefinition, ParameterValue};
 use crate::{naming, DataFrame, GgsqlError, Plot, Result};
 use polars::prelude::*;
 
diff --git a/src/plot/main.rs b/src/plot/main.rs
@@ -32,7 +32,7 @@ pub use super::types::{
 
 // Re-export Geom and related types from the layer::geom module
 pub use super::layer::geom::{
-    DefaultAesthetics, Geom, GeomTrait, GeomType, ParamDefinition, DefaultParamValue, StatResult,
+    DefaultAesthetics, DefaultParamValue, Geom, GeomTrait, GeomType, ParamDefinition, StatResult,
 };
 
 // Re-export Layer from the layer module
diff --git a/src/plot/projection/coord/cartesian.rs b/src/plot/projection/coord/cartesian.rs
@@ -1,7 +1,7 @@
 //! Cartesian coordinate system implementation
 
 use super::{CoordKind, CoordTrait};
-use crate::plot::types::{ParamConstraint, ParamDefinition, DefaultParamValue};
+use crate::plot::types::{DefaultParamValue, ParamConstraint, ParamDefinition};
 
 /// Cartesian coordinate system - standard x/y coordinates
 #[derive(Debug, Clone, Copy)]
diff --git a/src/plot/projection/coord/polar.rs b/src/plot/projection/coord/polar.rs
@@ -1,7 +1,7 @@
 //! Polar coordinate system implementation
 
 use super::{CoordKind, CoordTrait};
-use crate::plot::types::{ParamConstraint, ParamDefinition, DefaultParamValue};
+use crate::plot::types::{DefaultParamValue, ParamConstraint, ParamDefinition};
 
 /// Polar coordinate system - for pie charts, rose plots
 #[derive(Debug, Clone, Copy)]
diff --git a/src/plot/scale/scale_type/binned.rs b/src/plot/scale/scale_type/binned.rs
@@ -9,7 +9,7 @@ use super::{
     TransformKind, CLOSED_VALUES, OOB_CENSOR, OOB_SQUISH, OOB_VALUES_BINNED,
 };
 use crate::plot::types::{
-    ArrayConstraint, NumberConstraint, ParamConstraint, ParamDefinition, DefaultParamValue,
+    ArrayConstraint, DefaultParamValue, NumberConstraint, ParamConstraint, ParamDefinition,
 };
 use crate::plot::{ArrayElement, ParameterValue};
 
diff --git a/src/plot/scale/scale_type/continuous.rs b/src/plot/scale/scale_type/continuous.rs
@@ -6,7 +6,7 @@ use super::{
     ScaleTypeKind, ScaleTypeTrait, TransformKind, OOB_CENSOR, OOB_SQUISH, OOB_VALUES_CONTINUOUS,
 };
 use crate::plot::types::{
-    ArrayConstraint, NumberConstraint, ParamConstraint, ParamDefinition, DefaultParamValue,
+    ArrayConstraint, DefaultParamValue, NumberConstraint, ParamConstraint, ParamDefinition,
 };
 use crate::plot::{ArrayElement, ParameterValue};
 
diff --git a/src/plot/scale/scale_type/discrete.rs b/src/plot/scale/scale_type/discrete.rs
@@ -4,7 +4,7 @@ use polars::prelude::DataType;
 
 use super::super::transform::{Transform, TransformKind};
 use super::{ScaleTypeKind, ScaleTypeTrait};
-use crate::plot::types::{ParamConstraint, ParamDefinition, DefaultParamValue};
+use crate::plot::types::{DefaultParamValue, ParamConstraint, ParamDefinition};
 use crate::plot::ArrayElement;
 
 /// Discrete scale type - for categorical/discrete data
diff --git a/src/plot/scale/scale_type/mod.rs b/src/plot/scale/scale_type/mod.rs
@@ -27,7 +27,7 @@ use std::sync::Arc;
 
 use super::transform::{Transform, TransformKind};
 use crate::plot::aesthetic::{is_facet_aesthetic, is_positional_aesthetic};
-use crate::plot::types::{validate_parameter, ParamDefinition, DefaultParamValue};
+use crate::plot::types::{validate_parameter, DefaultParamValue, ParamDefinition};
 use crate::plot::{ArrayElement, ColumnInfo, ParameterValue};
 
 // Scale type implementations
diff --git a/src/plot/scale/scale_type/ordinal.rs b/src/plot/scale/scale_type/ordinal.rs
@@ -8,7 +8,7 @@ use polars::prelude::DataType;
 
 use super::super::transform::{Transform, TransformKind};
 use super::{ScaleTypeKind, ScaleTypeTrait};
-use crate::plot::types::{ParamConstraint, ParamDefinition, DefaultParamValue};
+use crate::plot::types::{DefaultParamValue, ParamConstraint, ParamDefinition};
 use crate::plot::ArrayElement;
 
 /// Ordinal scale type - for ordered categorical data with interpolated output
