refactor: remove utils

cloudacy · May 3, 2024 · 7917c46 · 7917c46
1 parent 4875d59
commit 7917c46
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 20 deletions.
diff --git a/src/address.rs b/src/address.rs
@@ -1,4 +1,4 @@
-use crate::{utils::init_vec, xml::XmlElement};
+use crate::xml::XmlElement;
 
 #[derive(Default)]
 pub struct Address<'a> {
@@ -34,13 +34,13 @@ impl<'a> Address<'a> {
     }
 
     pub fn with_phone(mut self, phone_number: &'a str) -> Self {
-        let phone_numbers = self.phone.get_or_insert_with(init_vec);
+        let phone_numbers = self.phone.get_or_insert_with(Vec::new);
         phone_numbers.push(phone_number);
         self
     }
 
     pub fn with_email(mut self, email_address: &'a str) -> Self {
-        let email_addresses = self.email.get_or_insert_with(init_vec);
+        let email_addresses = self.email.get_or_insert_with(Vec::new);
         email_addresses.push(email_address);
         self
     }

diff --git a/src/biller.rs b/src/biller.rs
@@ -1,6 +1,6 @@
 use crate::{
     address::Address, contact::Contact, identification::FurtherIdentification,
-    order_reference::OrderReference, utils::init_vec, xml::XmlElement,
+    order_reference::OrderReference, xml::XmlElement,
 };
 
 #[derive(Default)]
@@ -24,7 +24,7 @@ impl<'a> Biller<'a> {
         mut self,
         further_identification: FurtherIdentification<'a>,
     ) -> Self {
-        let fi = self.further_identification.get_or_insert_with(init_vec);
+        let fi = self.further_identification.get_or_insert_with(Vec::new);
         fi.push(further_identification);
         self
     }

diff --git a/src/contact.rs b/src/contact.rs
@@ -1,4 +1,4 @@
-use crate::{utils::init_vec, xml::XmlElement};
+use crate::xml::XmlElement;
 
 #[derive(Default)]
 pub struct Contact<'a> {
@@ -22,13 +22,13 @@ impl<'a> Contact<'a> {
     }
 
     pub fn with_phone(mut self, phone_number: &'a str) -> Self {
-        let phone_numbers = self.phone.get_or_insert_with(init_vec);
+        let phone_numbers = self.phone.get_or_insert_with(Vec::new);
         phone_numbers.push(phone_number);
         self
     }
 
     pub fn with_email(mut self, email_address: &'a str) -> Self {
-        let email_addresses = self.email.get_or_insert_with(init_vec);
+        let email_addresses = self.email.get_or_insert_with(Vec::new);
         email_addresses.push(email_address);
         self
     }

diff --git a/src/invoice_recipient.rs b/src/invoice_recipient.rs
@@ -1,6 +1,6 @@
 use crate::{
     address::Address, contact::Contact, identification::FurtherIdentification,
-    order_reference::OrderReference, utils::init_vec, xml::XmlElement,
+    order_reference::OrderReference, xml::XmlElement,
 };
 
 #[derive(Default)]
@@ -24,7 +24,7 @@ impl<'a> InvoiceRecipient<'a> {
         mut self,
         further_identification: FurtherIdentification<'a>,
     ) -> Self {
-        let fi = self.further_identification.get_or_insert_with(init_vec);
+        let fi = self.further_identification.get_or_insert_with(Vec::new);
         fi.push(further_identification);
         self
     }

diff --git a/src/lib.rs b/src/lib.rs
@@ -11,7 +11,6 @@ pub mod order_reference;
 pub mod payment_method;
 pub mod reduction_and_surcharge;
 pub mod tax;
-pub mod utils;
 pub mod xml;
 
 #[cfg(test)]

diff --git a/src/reduction_and_surcharge.rs b/src/reduction_and_surcharge.rs
@@ -1,6 +1,6 @@
 use rust_decimal::Decimal;
 
-use crate::{decimal::CloneAndRescale, utils::init_vec, xml::XmlElement};
+use crate::{decimal::CloneAndRescale, xml::XmlElement};
 
 pub enum ReductionAndSurchargeValue {
     Percentage(Decimal),
@@ -147,13 +147,13 @@ impl<'a> ReductionAndSurchargeListLineItemDetails<'a> {
     }
 
     pub fn with_reduction(mut self, reduction: ReductionListLineItem<'a>) -> Self {
-        let reductions = self.reduction_list_line_items.get_or_insert_with(init_vec);
+        let reductions = self.reduction_list_line_items.get_or_insert_with(Vec::new);
         reductions.push(reduction);
         self
     }
 
     pub fn with_surcharge(mut self, surcharge: SurchargeListLineItem<'a>) -> Self {
-        let surcharges = self.surcharge_list_line_items.get_or_insert_with(init_vec);
+        let surcharges = self.surcharge_list_line_items.get_or_insert_with(Vec::new);
         surcharges.push(surcharge);
         self
     }

diff --git a/src/utils.rs b/src/utils.rs
diff --git a/src/xml.rs b/src/xml.rs
@@ -1,8 +1,6 @@
 use once_cell::sync::Lazy;
 use regex::Regex;
 
-use crate::utils::init_vec;
-
 static XML_ESCAPE_REGEX: Lazy<Regex> = Lazy::new(|| Regex::new("[&\"'<>]").unwrap());
 
 fn xml_escape(s: impl AsRef<str>) -> String {
@@ -75,7 +73,7 @@ impl<'a> XmlElement<'a> {
             value: Box::new(value),
         };
 
-        self.attrs.get_or_insert_with(init_vec).push(attr);
+        self.attrs.get_or_insert_with(Vec::new).push(attr);
 
         self
     }