mirror/Easytier
1
0
Fork 0
mirror of https://github.com/EasyTier/EasyTier.git synced 2026-09-02 09:09:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

replace derive_builder with bon

Browse Source 
c'est meilleur

tauri
This commit is contained in:
Luna Yao
2026-05-01 21:53:17 +02:00
parent 96e2a6c775
commit 4b95f44a91
3 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
easytier-gui/src-tauri/src/lib.rs
+3 -6
View File
@@ -15,9 +15,7 @@ use easytier::rpc_service::remote_client::{
use easytier::web_client::{self, WebClient}; use easytier::web_client::{self, WebClient};
use easytier::{ use easytier::{
common::{ common::{
config::{ config::{ConfigLoader, ConfigSource, FileLoggerConfig, LoggingConfig, TomlConfigLoader},
ConfigLoader, ConfigSource, FileLoggerConfig, LoggingConfigBuilder, TomlConfigLoader,
},
log, log,
}, },
instance_manager::NetworkInstanceManager, 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 { let Ok(log_dir) = get_log_dir(app.app_handle()) else {
return Ok(()); return Ok(());
}; };
let config = LoggingConfigBuilder::default() let config = LoggingConfig::builder()
.file_logger(FileLoggerConfig { .file_logger(FileLoggerConfig {
dir: Some(log_dir.to_string_lossy().to_string()), dir: Some(log_dir.to_string_lossy().to_string()),
level: None, level: None,
@@ -1326,8 +1324,7 @@ pub fn run_gui() -> std::process::ExitCode {
size_mb: None, size_mb: None,
count: None, count: None,
}) })
.build() .build();
.map_err(|e| e.to_string())?;
let Ok(_) = log::init(&config, true) else { let Ok(_) = log::init(&config, true) else {
return Ok(()); return Ok(());
}; };
easytier/Cargo.toml
-1
View File
@@ -250,7 +250,6 @@ hickory-resolver = "0.26.0"
hickory-server = { version = "0.26.0", features = ["resolver"], optional = true } hickory-server = { version = "0.26.0", features = ["resolver"], optional = true }
bon = "3.9.1" bon = "3.9.1"
derive_builder = "0.20.2"
humantime-serde = "1.1.1" humantime-serde = "1.1.1"
multimap = "0.10.1" multimap = "0.10.1"
version-compare = "0.2.0" version-compare = "0.2.0"
easytier/src/common/config.rs
+4 -3
View File
@@ -12,6 +12,7 @@ use crate::{
}; };
use anyhow::Context; use anyhow::Context;
use base64::{Engine as _, prelude::BASE64_STANDARD}; use base64::{Engine as _, prelude::BASE64_STANDARD};
use bon::Builder;
use clap::ValueEnum; use clap::ValueEnum;
use clap::builder::PossibleValue; use clap::builder::PossibleValue;
use derivative::Derivative; use derivative::Derivative;
@@ -509,11 +510,11 @@ pub struct ConsoleLoggerConfig {
pub level: Option<String>, pub level: Option<String>,
} }
#[derive(Debug, Clone, Deserialize, Serialize, PartialEq, derive_builder::Builder)] #[derive(Debug, Clone, Deserialize, Serialize, PartialEq, Builder)]
pub struct LoggingConfig { pub struct LoggingConfig {
#[builder(setter(into, strip_option), default = None)] #[builder(into)]
pub file_logger: Option<FileLoggerConfig>, pub file_logger: Option<FileLoggerConfig>,
#[builder(setter(into, strip_option), default = None)] #[builder(into)]
pub console_logger: Option<ConsoleLoggerConfig>, pub console_logger: Option<ConsoleLoggerConfig>,
} }