Use bon instead of typed-builder

Signed-off-by: Alex Saveau <[email protected]>
SUPERCILEX · Aug 6, 2024 · 9e28a4f · 9e28a4f
1 parent 76257c0
commit 9e28a4f
Show file tree

Hide file tree

Showing 5 changed files with 102 additions and 34 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/fuc_engine/Cargo.toml b/fuc_engine/Cargo.toml
@@ -10,10 +10,10 @@ categories = ["filesystem"]
 license.workspace = true
 
 [dependencies]
+bon = "1.0.6"
 crossbeam-channel = "0.5.13"
 thiserror = "1.0.63"
 tracing = { version = "0.1.40", default-features = false, features = ["attributes"], optional = true }
-typed-builder = "0.19.1"
 
 [target.'cfg(target_os = "linux")'.dependencies]
 rustix = { version = "0.38.34", features = ["fs", "thread", "linux_latest"] }

diff --git a/fuc_engine/api.golden b/fuc_engine/api.golden
@@ -44,9 +44,9 @@ impl<T> tracing::instrument::Instrument for fuc_engine::Error
 impl<T> tracing::instrument::WithSubscriber for fuc_engine::Error
 pub struct fuc_engine::CopyOp<'a, 'b, I1: core::convert::Into<alloc::borrow::Cow<'a, std::path::Path>> + 'a, I2: core::convert::Into<alloc::borrow::Cow<'b, std::path::Path>> + 'b, F: core::iter::traits::collect::IntoIterator<Item = (I1, I2)>>
 impl<'a, 'b, I1: core::convert::Into<alloc::borrow::Cow<'a, std::path::Path>> + 'a, I2: core::convert::Into<alloc::borrow::Cow<'b, std::path::Path>> + 'b, F: core::iter::traits::collect::IntoIterator<Item = (I1, I2)>> fuc_engine::CopyOp<'a, 'b, I1, I2, F>
-pub fn fuc_engine::CopyOp<'a, 'b, I1, I2, F>::run(self) -> core::result::Result<(), fuc_engine::Error>
+pub fn fuc_engine::CopyOp<'a, 'b, I1, I2, F>::builder() -> CopyOpBuilder<'a, 'b, I1, I2, F>
 impl<'a, 'b, I1: core::convert::Into<alloc::borrow::Cow<'a, std::path::Path>> + 'a, I2: core::convert::Into<alloc::borrow::Cow<'b, std::path::Path>> + 'b, F: core::iter::traits::collect::IntoIterator<Item = (I1, I2)>> fuc_engine::CopyOp<'a, 'b, I1, I2, F>
-pub fn fuc_engine::CopyOp<'a, 'b, I1, I2, F>::builder() -> CopyOpBuilder<'a, 'b, I1, I2, F, ((), (), (), (), ())>
+pub fn fuc_engine::CopyOp<'a, 'b, I1, I2, F>::run(self) -> core::result::Result<(), fuc_engine::Error>
 impl<'a, 'b, I1: core::fmt::Debug + core::convert::Into<alloc::borrow::Cow<'a, std::path::Path>> + 'a, I2: core::fmt::Debug + core::convert::Into<alloc::borrow::Cow<'b, std::path::Path>> + 'b, F: core::fmt::Debug + core::iter::traits::collect::IntoIterator<Item = (I1, I2)>> core::fmt::Debug for fuc_engine::CopyOp<'a, 'b, I1, I2, F>
 pub fn fuc_engine::CopyOp<'a, 'b, I1, I2, F>::fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result
 impl<'a, 'b, I1, I2, F> core::marker::Freeze for fuc_engine::CopyOp<'a, 'b, I1, I2, F> where F: core::marker::Freeze
@@ -74,10 +74,10 @@ pub fn fuc_engine::CopyOp<'a, 'b, I1, I2, F>::from(t: T) -> T
 impl<T> tracing::instrument::Instrument for fuc_engine::CopyOp<'a, 'b, I1, I2, F>
 impl<T> tracing::instrument::WithSubscriber for fuc_engine::CopyOp<'a, 'b, I1, I2, F>
 pub struct fuc_engine::RemoveOp<'a, I: core::convert::Into<alloc::borrow::Cow<'a, std::path::Path>> + 'a, F: core::iter::traits::collect::IntoIterator<Item = I>>
+impl<'a, I: core::convert::Into<alloc::borrow::Cow<'a, std::path::Path>> + 'a, F: core::iter::traits::collect::IntoIterator<Item = I>> fuc_engine::RemoveOp<'a, I, F>
+pub fn fuc_engine::RemoveOp<'a, I, F>::builder() -> RemoveOpBuilder<'a, I, F>
 impl<'a, I: core::convert::Into<alloc::borrow::Cow<'a, std::path::Path>>, F: core::iter::traits::collect::IntoIterator<Item = I>> fuc_engine::RemoveOp<'a, I, F>
 pub fn fuc_engine::RemoveOp<'a, I, F>::run(self) -> core::result::Result<(), fuc_engine::Error>
-impl<'a, I: core::convert::Into<alloc::borrow::Cow<'a, std::path::Path>> + 'a, F: core::iter::traits::collect::IntoIterator<Item = I>> fuc_engine::RemoveOp<'a, I, F>
-pub fn fuc_engine::RemoveOp<'a, I, F>::builder() -> RemoveOpBuilder<'a, I, F, ((), (), (), ())>
 impl<'a, I: core::fmt::Debug + core::convert::Into<alloc::borrow::Cow<'a, std::path::Path>> + 'a, F: core::fmt::Debug + core::iter::traits::collect::IntoIterator<Item = I>> core::fmt::Debug for fuc_engine::RemoveOp<'a, I, F>
 pub fn fuc_engine::RemoveOp<'a, I, F>::fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result
 impl<'a, I, F> core::marker::Freeze for fuc_engine::RemoveOp<'a, I, F> where F: core::marker::Freeze

diff --git a/fuc_engine/src/ops/copy.rs b/fuc_engine/src/ops/copy.rs
@@ -1,6 +1,6 @@
 use std::{borrow::Cow, fmt::Debug, fs, io, marker::PhantomData, path::Path};
 
-use typed_builder::TypedBuilder;
+use bon::builder;
 
 use crate::{
     ops::{compat::DirectoryOp, IoErr},
@@ -19,7 +19,8 @@ pub fn copy_file<P: AsRef<Path>, Q: AsRef<Path>>(from: P, to: Q) -> Result<(), E
         .run()
 }
 
-#[derive(TypedBuilder, Debug)]
+#[derive(Debug)]
+#[builder]
 pub struct CopyOp<
     'a,
     'b,

diff --git a/fuc_engine/src/ops/remove.rs b/fuc_engine/src/ops/remove.rs
@@ -7,7 +7,7 @@ use std::{
     path::{Path, MAIN_SEPARATOR_STR},
 };
 
-use typed_builder::TypedBuilder;
+use bon::builder;
 
 use crate::{
     ops::{compat::DirectoryOp, IoErr},
@@ -29,7 +29,8 @@ pub fn remove_file<P: AsRef<Path>>(path: P) -> Result<(), Error> {
         .run()
 }
 
-#[derive(TypedBuilder, Debug)]
+#[derive(Debug)]
+#[builder]
 pub struct RemoveOp<'a, I: Into<Cow<'a, Path>> + 'a, F: IntoIterator<Item = I>> {
     files: F,
     #[builder(default = false)]