chore: remove optional default traits

Author: noahbald

Cargo.lock

@@ -1,6 +1,6 @@
 [workspace]
 resolver = "2"
-members = ["crates/*", "derive"]
+members = ["crates/*"]
 
 [workspace.lints.clippy]
 pedantic = { level = "warn", priority = -1 }

Cargo.toml

@@ -17,7 +17,6 @@ oxvg_ast = { workspace = true, features = [
   "parse",
   "serialize",
 ] }
-oxvg_derive = { workspace = true }
 oxvg_path = { workspace = true, features = ["oxvg", "serde"] }
 oxvg_collections = { workspace = true }
 

crates/oxvg_optimiser/Cargo.toml

@@ -4,24 +4,18 @@ use oxvg_ast::{
     element::Element,
     visitor::{Context, Visitor},
 };
-use oxvg_derive::OptionalDefault;
 use serde::Deserialize;
 
-use crate::Job;
-
-#[derive(Deserialize, Default, Clone, OptionalDefault)]
+#[derive(Deserialize, Default, Clone)]
 #[serde(rename_all = "camelCase")]
-#[job_default(is_default = false)]
 pub struct AddAttributesToSVGElement {
     pub attributes: BTreeMap<String, String>,
 }
 
-impl<E: Element> Job<E> for AddAttributesToSVGElement {}
-
 impl<E: Element> Visitor<E> for AddAttributesToSVGElement {
     type Error = String;
 
-    fn element(&mut self, element: &mut E, _context: & mut Context<E>) -> Result<(), String> {
+    fn element(&mut self, element: &mut E, _context: &mut Context<E>) -> Result<(), String> {
         let name = element.local_name();
 
         if !element.is_root() || name.as_ref() != "svg" {

crates/oxvg_optimiser/src/jobs/add_attributes_to_svg_element.rs

@@ -4,14 +4,10 @@ use oxvg_ast::{
     element::Element,
     visitor::{Context, Visitor},
 };
-use oxvg_derive::OptionalDefault;
 use serde::Deserialize;
 
-use crate::Job;
-
-#[derive(Deserialize, Default, Clone, OptionalDefault)]
+#[derive(Deserialize, Default, Clone)]
 #[serde(rename_all = "camelCase")]
-#[job_default(is_default = false)]
 /// Adds to the `class` attribute of the root `<svg>` element, omitting duplicates
 ///
 /// <div class="warning">Unlike SVGO, this may change the order of your classes</div>
@@ -20,12 +16,10 @@ pub struct AddClassesToSVG {
     pub class_name: Option<String>,
 }
 
-impl<E: Element> Job<E> for AddClassesToSVG {}
-
 impl<E: Element> Visitor<E> for AddClassesToSVG {
     type Error = String;
 
-    fn element(&mut self, element: &mut E, _context: & mut Context<E>) -> Result<(), String> {
+    fn element(&mut self, element: &mut E, _context: &mut Context<E>) -> Result<(), String> {
         if !element.is_root() || element.local_name() != "svg".into() {
             return Ok(());
         }

crates/oxvg_optimiser/src/jobs/add_classes_to_svg.rs

@@ -20,11 +20,10 @@ use oxvg_ast::{
     visitor::{Context, ContextFlags, PrepareOutcome, Visitor},
 };
 use oxvg_collections::{collections, regex::REFERENCES_URL};
-use oxvg_derive::OptionalDefault;
 use oxvg_path::{command::Data, convert, Path};
 use serde::Deserialize;
 
-#[derive(Deserialize, Default, Clone, Debug, OptionalDefault)]
+#[derive(Deserialize, Default, Clone, Debug)]
 #[serde(rename_all = "camelCase")]
 /// Apply transformations to the path data
 pub struct ApplyTransforms {
@@ -35,15 +34,15 @@ pub struct ApplyTransforms {
 impl<E: Element> Visitor<E> for ApplyTransforms {
     type Error = String;
 
-    fn prepare(&mut self, _document: &E,  _context_flags: &mut ContextFlags) -> PrepareOutcome {
+    fn prepare(&mut self, _document: &E, _context_flags: &mut ContextFlags) -> PrepareOutcome {
         PrepareOutcome::use_style
     }
 
     fn use_style(&self, element: &E) -> bool {
         element.get_attribute_local(&"d".into()).is_some()
     }
 
-    fn element(&mut self, element: &mut E, context: & mut Context<E>) -> Result<(), String> {
+    fn element(&mut self, element: &mut E, context: &mut Context<E>) -> Result<(), String> {
         let d_localname = "d".into();
         let Some(path) = element.get_attribute_local(&d_localname) else {
             log::debug!("run: path has no d");

crates/oxvg_optimiser/src/jobs/apply_transforms.rs

@@ -3,25 +3,20 @@ use oxvg_ast::{
     element::Element,
     visitor::{Context, Visitor},
 };
-use oxvg_derive::OptionalDefault;
 use serde::Deserialize;
 
-use crate::Job;
-
-#[derive(Deserialize, Default, Clone, OptionalDefault)]
+#[derive(Deserialize, Default, Clone)]
 #[serde(rename_all = "camelCase")]
 pub struct CleanupAttributes {
     newlines: Option<bool>,
     trim: Option<bool>,
     spaces: Option<bool>,
 }
 
-impl<E: Element> Job<E> for CleanupAttributes {}
-
 impl<E: Element> Visitor<E> for CleanupAttributes {
     type Error = String;
 
-    fn element(&mut self, element: &mut E, _context: & mut Context<E>) -> Result<(), String> {
+    fn element(&mut self, element: &mut E, _context: &mut Context<E>) -> Result<(), String> {
         for mut attr in element.attributes().iter() {
             if matches!(self.newlines, Some(true)) {
                 attr.set_value(attr.value().as_ref().replace('\n', " ").into());

crates/oxvg_optimiser/src/jobs/cleanup_attributes.rs

@@ -4,13 +4,12 @@ use oxvg_ast::{
     element::Element,
     visitor::{Context, PrepareOutcome, Visitor},
 };
-use oxvg_derive::OptionalDefault;
 use regex::Regex;
 use serde::Deserialize;
 
 use super::ContextFlags;
 
-#[derive(Deserialize, Default, Clone, OptionalDefault)]
+#[derive(Deserialize, Default, Clone)]
 #[serde(rename_all = "camelCase")]
 pub struct CleanupEnableBackground {
     #[serde(skip_deserializing)]
@@ -25,7 +24,7 @@ struct EnableBackgroundDimensions<'a> {
 impl<E: Element> Visitor<E> for CleanupEnableBackground {
     type Error = String;
 
-    fn prepare(&mut self, document: &E,  _context_flags: &mut ContextFlags) -> PrepareOutcome {
+    fn prepare(&mut self, document: &E, _context_flags: &mut ContextFlags) -> PrepareOutcome {
         let Some(root) = document.find_element() else {
             return PrepareOutcome::none;
         };
@@ -42,7 +41,7 @@ impl<E: Element> Visitor<E> for CleanupEnableBackground {
     /// - Drop `enable-background` on `<svg>` node, if it matches the node's width and height
     /// - Set `enable-background` to `"new"` on `<mask>` or `<pattern>` nodes, if it matches the
     ///   node's width and height
-    fn element(&mut self, element: &mut E, _context: & mut Context<E>) -> Result<(), String> {
+    fn element(&mut self, element: &mut E, _context: &mut Context<E>) -> Result<(), String> {
         let style_name = &"style".into();
         if let Some(mut style) = element.get_attribute_node_local(style_name) {
             let new_value = Regex::new(r"(^|;)\s*enable-background\s*:\s*new[\d\s]*")

crates/oxvg_optimiser/src/jobs/cleanup_enable_background.rs

@@ -10,7 +10,6 @@ use oxvg_ast::{
     node::{self, Node},
     visitor::{Context, PrepareOutcome, Visitor},
 };
-use oxvg_derive::OptionalDefault;
 use serde::Deserialize;
 
 use crate::utils::find_references;
@@ -33,7 +32,7 @@ struct RefRename {
     referenced_id: String,
 }
 
-#[derive(Debug, Deserialize, Default, Clone, OptionalDefault)]
+#[derive(Debug, Deserialize, Default, Clone)]
 #[serde(rename_all = "camelCase")]
 pub struct CleanupIds {
     remove: Option<bool>,

crates/oxvg_optimiser/src/jobs/cleanup_ids.rs

@@ -2,25 +2,19 @@ use oxvg_ast::{
     element::Element,
     visitor::{Context, Visitor},
 };
-use oxvg_derive::OptionalDefault;
 use serde::Deserialize;
 
 use crate::utils::cleanup_values::{self, CleanupValues, Mode};
 
-use super::Job;
-
-#[derive(Deserialize, Default, Clone, OptionalDefault)]
+#[derive(Deserialize, Default, Clone)]
 #[serde(rename_all = "camelCase")]
-#[job_default(is_default = false)]
 pub struct CleanupListOfValues {
     float_precision: Option<usize>,
     leading_zero: Option<bool>,
     default_px: Option<bool>,
     convert_to_px: Option<bool>,
 }
 
-impl<E: Element> Job<E> for CleanupListOfValues {}
-
 impl<E: Element> Visitor<E> for CleanupListOfValues {
     type Error = String;
 

crates/oxvg_optimiser/src/jobs/cleanup_list_of_values.rs

@@ -2,14 +2,11 @@ use oxvg_ast::{
     element::Element,
     visitor::{Context, Visitor},
 };
-use oxvg_derive::OptionalDefault;
 use serde::Deserialize;
 
 use crate::utils::cleanup_values::{self, CleanupValues, Mode};
 
-use super::Job;
-
-#[derive(Deserialize, Default, Clone, OptionalDefault)]
+#[derive(Deserialize, Default, Clone)]
 #[serde(rename_all = "camelCase")]
 pub struct CleanupNumericValues {
     float_precision: Option<usize>,
@@ -18,8 +15,6 @@ pub struct CleanupNumericValues {
     convert_to_px: Option<bool>,
 }
 
-impl<E: Element> Job<E> for CleanupNumericValues {}
-
 impl<E: Element> Visitor<E> for CleanupNumericValues {
     type Error = String;
 

crates/oxvg_optimiser/src/jobs/cleanup_numeric_values.rs

@@ -10,10 +10,9 @@ use oxvg_ast::{
     visitor::{Context, ContextFlags, PrepareOutcome, Visitor},
 };
 use oxvg_collections::collections::{ElementGroup, Group, INHERITABLE_ATTRS};
-use oxvg_derive::OptionalDefault;
 use serde::Deserialize;
 
-#[derive(Deserialize, Clone, OptionalDefault)]
+#[derive(Deserialize, Clone)]
 #[serde(rename_all = "camelCase")]
 pub struct CollapseGroups(bool);
 

crates/oxvg_optimiser/src/jobs/collapse_groups.rs

@@ -19,7 +19,6 @@ use oxvg_ast::{
     element::Element,
     visitor::{Context, PrepareOutcome, Visitor},
 };
-use oxvg_derive::OptionalDefault;
 use serde::Deserialize;
 
 use super::ContextFlags;
@@ -53,7 +52,7 @@ enum Color<'a> {
     None,
 }
 
-#[derive(Deserialize, Default, Clone, OptionalDefault)]
+#[derive(Deserialize, Default, Clone)]
 #[serde(rename_all = "camelCase")]
 pub struct ConvertColors {
     pub method: Option<Method>,
@@ -62,7 +61,7 @@ pub struct ConvertColors {
 impl<E: Element> Visitor<E> for ConvertColors {
     type Error = String;
 
-    fn prepare(&mut self, _document: &E,  _context_flags: &mut ContextFlags) -> PrepareOutcome {
+    fn prepare(&mut self, _document: &E, _context_flags: &mut ContextFlags) -> PrepareOutcome {
         match self.method {
             Some(Method::Value {
                 names_2_hex,
@@ -82,7 +81,7 @@ impl<E: Element> Visitor<E> for ConvertColors {
         }
     }
 
-    fn element(&mut self, element: &mut E, _context: & mut Context<E>) -> Result<(), String> {
+    fn element(&mut self, element: &mut E, _context: &mut Context<E>) -> Result<(), String> {
         let mask_localname = &"mask".into();
         let is_masked = &element.local_name() == mask_localname
             || element.closest_local(mask_localname).is_some();