From 4b95f44a912c9a4efc0b5343375c2eb8ce512063 Mon Sep 17 00:00:00 2001
From: Luna Yao <40349250+ZnqbuZ@users.noreply.github.com>
Date: Thu, 30 Apr 2026 18:50:37 +0200
Subject: [PATCH] replace derive_builder with bon

c'est meilleur

tauri
---
 easytier-gui/src-tauri/src/lib.rs | 9 +++------
 easytier/Cargo.toml               | 1 -
 easytier/src/common/config.rs     | 7 ++++---
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/easytier-gui/src-tauri/src/lib.rs b/easytier-gui/src-tauri/src/lib.rs
index 73a74c04..dce9138f 100644
--- a/easytier-gui/src-tauri/src/lib.rs
+++ b/easytier-gui/src-tauri/src/lib.rs
@@ -15,9 +15,7 @@ use easytier::rpc_service::remote_client::{
 use easytier::web_client::{self, WebClient};
 use easytier::{
     common::{
-        config::{
-            ConfigLoader, ConfigSource, FileLoggerConfig, LoggingConfigBuilder, TomlConfigLoader,
-        },
+        config::{ConfigLoader, ConfigSource, FileLoggerConfig, LoggingConfig, TomlConfigLoader},
         log,
     },
     instance_manager::NetworkInstanceManager,
@@ -1318,7 +1316,7 @@ pub fn run_gui() -> std::process::ExitCode {
             let Ok(log_dir) = get_log_dir(app.app_handle()) else {
                 return Ok(());
             };
-            let config = LoggingConfigBuilder::default()
+            let config = LoggingConfig::builder()
                 .file_logger(FileLoggerConfig {
                     dir: Some(log_dir.to_string_lossy().to_string()),
                     level: None,
@@ -1326,8 +1324,7 @@ pub fn run_gui() -> std::process::ExitCode {
                     size_mb: None,
                     count: None,
                 })
-                .build()
-                .map_err(|e| e.to_string())?;
+                .build();
             let Ok(_) = log::init(&config, true) else {
                 return Ok(());
             };
diff --git a/easytier/Cargo.toml b/easytier/Cargo.toml
index 41783c5b..bb49807c 100644
--- a/easytier/Cargo.toml
+++ b/easytier/Cargo.toml
@@ -250,7 +250,6 @@ hickory-resolver = "0.26.0"
 hickory-server = { version = "0.26.0", features = ["resolver"], optional = true }
 
 bon = "3.9.1"
-derive_builder = "0.20.2"
 humantime-serde = "1.1.1"
 multimap = "0.10.1"
 version-compare = "0.2.0"
diff --git a/easytier/src/common/config.rs b/easytier/src/common/config.rs
index 01f024b0..0bf3a28f 100644
--- a/easytier/src/common/config.rs
+++ b/easytier/src/common/config.rs
@@ -12,6 +12,7 @@ use crate::{
 };
 use anyhow::Context;
 use base64::{Engine as _, prelude::BASE64_STANDARD};
+use bon::Builder;
 use clap::ValueEnum;
 use clap::builder::PossibleValue;
 use derivative::Derivative;
@@ -509,11 +510,11 @@ pub struct ConsoleLoggerConfig {
     pub level: Option<String>,
 }
 
-#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, derive_builder::Builder)]
+#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, Builder)]
 pub struct LoggingConfig {
-    #[builder(setter(into, strip_option), default = None)]
+    #[builder(into)]
     pub file_logger: Option<FileLoggerConfig>,
-    #[builder(setter(into, strip_option), default = None)]
+    #[builder(into)]
     pub console_logger: Option<ConsoleLoggerConfig>,
 }