Fix lints

Nuckal777 · Jan 18, 2023 · f315199 · f315199
1 parent 74f91bb
commit f315199
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 20 deletions.
diff --git a/src/client.rs b/src/client.rs
@@ -41,7 +41,7 @@ impl Client {
         let response = crate::packet::parse(&mut self.stream)?;
         if let Packet::Result { message, success } = response {
             if !success {
-                eprintln!("Unlocking failed. It is likely that a wrong passphrase was entered. Received from daemon: {}", message);
+                eprintln!("Unlocking failed. It is likely that a wrong passphrase was entered. Received from daemon: {message}");
             }
         } else {
             eprintln!("Received an unexpected return value from daemon.");
@@ -64,7 +64,7 @@ impl Client {
         let response = crate::packet::parse(&mut self.stream)?;
         if let Packet::Result { message, success } = response {
             if !success {
-                eprintln!("Storing the credential failed. You may need to `nicator unlock`. Received from daemon: {}", message);
+                eprintln!("Storing the credential failed. You may need to `nicator unlock`. Received from daemon: {message}");
             }
         } else {
             eprintln!("Received an unexpected return value from daemon.");

diff --git a/src/lib.rs b/src/lib.rs
@@ -1,6 +1,6 @@
 use std::{io::Read, path::PathBuf};
 
-use clap::{crate_authors, crate_version, Arg, ArgMatches, Command, ArgAction};
+use clap::{crate_authors, crate_version, Arg, ArgAction, ArgMatches, Command};
 use client::Client;
 use secstr::SecUtf8;
 use thiserror::Error;
@@ -85,7 +85,7 @@ impl ProgramOptions {
             return PathBuf::from(path);
         }
         let uid = nix::unistd::getuid();
-        let file_name = format!("/tmp/nicator-{}.sock", uid);
+        let file_name = format!("/tmp/nicator-{uid}.sock");
         PathBuf::from(file_name)
     }
 
@@ -162,7 +162,7 @@ pub fn run() -> Exit {
         match options {
             Ok(options) => perform_command(name, options),
             Err(err) => {
-                eprintln!("Failed to determine arguments. {}", err);
+                eprintln!("Failed to determine arguments. {err}");
                 Exit::Failure
             }
         }
@@ -250,8 +250,8 @@ fn perform_unlock(options: &ProgramOptions) -> Exit {
         }),
         Err(err) => {
             eprintln!(
-                "Failed to canonicalize store path {:?}: {}",
-                options.store, err
+                "Failed to canonicalize store path {:?}: {err}",
+                options.store
             );
             Exit::Failure
         }
@@ -320,7 +320,7 @@ fn perform_export(options: &ProgramOptions) -> Exit {
             }
         }
         Err(err) => {
-            eprintln!("Failed to export credentials: {}", err);
+            eprintln!("Failed to export credentials: {err}");
             return Exit::Failure;
         }
     }
@@ -361,13 +361,13 @@ fn perform_import(options: &ProgramOptions) -> Exit {
             match store.encrypt_at(&options.store, passphrase.unsecure()) {
                 Ok(_) => Exit::Success,
                 Err(err) => {
-                    eprintln!("Failed to store imported credentials. {}", err);
+                    eprintln!("Failed to store imported credentials. {err}");
                     Exit::Failure
                 }
             }
         }
         Err(err) => {
-            eprintln!("Failed to import credentials: {}", err);
+            eprintln!("Failed to import credentials: {err}");
             Exit::Failure
         }
     }

diff --git a/src/server.rs b/src/server.rs
@@ -106,14 +106,14 @@ impl Daemon {
                 self.passphrase = Some(passphrase);
                 self.timeout = Duration::from_secs(timeout);
                 let response = Packet::Result {
-                    message: "".to_string(),
+                    message: String::new(),
                     success: true,
                 };
                 crate::packet::write(conn, &response)?;
             }
             Err(err) => {
                 let response = Packet::Result {
-                    message: format!("{}", err),
+                    message: format!("{err}"),
                     success: false,
                 };
                 crate::packet::write(conn, &response)?;
@@ -136,14 +136,14 @@ impl Daemon {
             match result {
                 Ok(_) => {
                     let response = Packet::Result {
-                        message: "".to_string(),
+                        message: String::new(),
                         success: true,
                     };
                     crate::packet::write(conn, &response)?;
                 }
                 Err(err) => {
                     let response = Packet::Result {
-                        message: format!("{}", err),
+                        message: format!("{err}"),
                         success: false,
                     };
                     crate::packet::write(conn, &response)?;
@@ -190,7 +190,7 @@ impl Daemon {
                 }
                 Err(err) => {
                     let response = Packet::Result {
-                        message: format!("{}", err),
+                        message: format!("{err}"),
                         success: false,
                     };
                     crate::packet::write(conn, &response)?;
@@ -225,14 +225,14 @@ impl Daemon {
             match result {
                 Ok(_) => {
                     let response = Packet::Result {
-                        message: "".to_string(),
+                        message: String::new(),
                         success: true,
                     };
                     crate::packet::write(conn, &response)?;
                 }
                 Err(err) => {
                     let response = Packet::Result {
-                        message: format!("{}", err),
+                        message: format!("{err}"),
                         success: false,
                     };
                     crate::packet::write(conn, &response)?;
@@ -264,7 +264,7 @@ pub fn launch<P: AsRef<Path>>(socket_path: P) -> Result<(), crate::Error> {
     let mut daemon = Daemon::new(&socket_path)?;
     match daemon.main_loop(socket_path.as_ref()) {
         Ok(_) => println!("nicator server exiting"),
-        Err(err) => eprintln!("nicator server had an error: {}", err),
+        Err(err) => eprintln!("nicator server had an error: {err}"),
     }
     std::fs::remove_file(socket_path)?;
     Ok(())

diff --git a/src/store.rs b/src/store.rs
@@ -60,7 +60,7 @@ impl Credential {
     /// If the url is not valid.
     pub fn from_url(url_str: &str) -> Result<Credential, url::ParseError> {
         let url = url::Url::parse(url_str)?;
-        let port = url.port().map_or(String::new(), |p| format!(":{}", p));
+        let port = url.port().map_or(String::new(), |p| format!(":{p}"));
         Ok(Credential {
             host: url.host_str().unwrap_or("").to_string() + &port,
             // leading slash is not required for git
@@ -255,7 +255,7 @@ mod tests {
                 super::Credential {
                     host: "host2".to_string(),
                     password: SecUtf8::from("pw2"),
-                    path: "".to_string(),
+                    path: String::new(),
                     protocol: "protocol2".to_string(),
                     username: "user2".to_string(),
                 },