fmt

src/filetransfer/builder.rs

@@ -40,9 +40,7 @@ impl Builder {
             }
             (protocol, params) => {
                 error!("Invalid params for protocol '{:?}'", protocol);
-                panic!(
+                panic!("Invalid protocol '{protocol:?}' with parameters of type {params:?}")
-                    "Invalid protocol '{protocol:?}' with parameters of type {params:?}"
-                )
             }
         }
     }

src/system/logging.rs

@@ -32,8 +32,7 @@ pub fn init(level: LogLevel) -> Result<(), String> {
     // Prepare log config
     let config = ConfigBuilder::new().set_time_format_rfc3339().build();
     // Make logger
-    WriteLogger::init(level, config, file)
+    WriteLogger::init(level, config, file).map_err(|e| format!("Failed to initialize logger: {e}"))
-        .map_err(|e| format!("Failed to initialize logger: {e}"))
 }
 
 #[cfg(test)]

src/ui/activities/filetransfer/actions/change_dir.rs

@@ -158,9 +158,7 @@ impl FileTransferActivity {
                 trace!("The user doesn't want to create the directory; disabling synchronized browsing");
                 self.log(
                     LogLevel::Warn,
-                    format!(
+                    format!("Refused to create '{name}'; synchronized browsing disabled"),
-                        "Refused to create '{name}'; synchronized browsing disabled"
-                    ),
                 );
                 self.browser.toggle_sync_browsing();
                 self.refresh_remote_status_bar();

src/ui/activities/filetransfer/actions/newfile.rs

@@ -17,10 +17,7 @@ impl FileTransferActivity {
             }
         }
         if file_exists {
-            self.log_and_alert(
+            self.log_and_alert(LogLevel::Warn, format!("File \"{input}\" already exists",));
-                LogLevel::Warn,
-                format!("File \"{input}\" already exists",),
-            );
             return;
         }
         // Create file
@@ -47,20 +44,16 @@ impl FileTransferActivity {
             }
         }
         if file_exists {
-            self.log_and_alert(
+            self.log_and_alert(LogLevel::Warn, format!("File \"{input}\" already exists",));
-                LogLevel::Warn,
-                format!("File \"{input}\" already exists",),
-            );
             return;
         }
         // Get path on remote
         let file_path: PathBuf = PathBuf::from(input.as_str());
         // Create file (on local)
         match tempfile::NamedTempFile::new() {
-            Err(err) => self.log_and_alert(
+            Err(err) => {
-                LogLevel::Error,
+                self.log_and_alert(LogLevel::Error, format!("Could not create tempfile: {err}"))
-                format!("Could not create tempfile: {err}"),
+            }
-            ),
             Ok(tfile) => {
                 // Stat tempfile
                 let local_file: File = match self.host.stat(tfile.path()) {

src/ui/activities/filetransfer/actions/symlink.rs

@@ -27,10 +27,7 @@ impl FileTransferActivity {
                     );
                 }
                 Err(err) => {
-                    self.log_and_alert(
+                    self.log_and_alert(LogLevel::Error, format!("Could not create symlink: {err}"));
-                        LogLevel::Error,
-                        format!("Could not create symlink: {err}"),
-                    );
                 }
             }
         }