Apply suggestions from code review

pull/633/head
Fabian-Lars 2 years ago committed by GitHub
parent 49cf3e4938
commit ae36b05299
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -184,14 +184,13 @@ impl Default for Builder {
message message
)) ))
}); });
let log_name = None;
Self { Self {
dispatch, dispatch,
rotation_strategy: DEFAULT_ROTATION_STRATEGY, rotation_strategy: DEFAULT_ROTATION_STRATEGY,
timezone_strategy: DEFAULT_TIMEZONE_STRATEGY, timezone_strategy: DEFAULT_TIMEZONE_STRATEGY,
max_file_size: DEFAULT_MAX_FILE_SIZE, max_file_size: DEFAULT_MAX_FILE_SIZE,
targets: DEFAULT_LOG_TARGETS.into(), targets: DEFAULT_LOG_TARGETS.into(),
log_name, log_name: None,
} }
} }
} }
@ -283,7 +282,7 @@ impl Builder {
/// ); // Outputs content to custom-name.log /// ); // Outputs content to custom-name.log
/// ///
/// ``` /// ```
pub fn log_name(mut self, log_name: &str) -> Self { pub fn log_name<S: Into<String>>(mut self, log_name: S) -> Self {
self.log_name = Some(log_name.to_string()); self.log_name = Some(log_name.to_string());
self self
} }
@ -310,11 +309,10 @@ impl Builder {
plugin::Builder::new("log") plugin::Builder::new("log")
.invoke_handler(tauri::generate_handler![log]) .invoke_handler(tauri::generate_handler![log])
.setup(move |app_handle| { .setup(move |app_handle| {
let name = self let log_name = self
.log_name .log_name
.clone() .as_deref()
.unwrap_or_else(|| app_handle.package_info().name.clone()); .unwrap_or_else(|| &app_handle.package_info().name);
let log_name = name.as_str();
// setup targets // setup targets
for target in &self.targets { for target in &self.targets {

Loading…
Cancel
Save