Skip to content

Commit f315199

Browse files
committed
Fix lints
1 parent 74f91bb commit f315199

File tree

4 files changed

+20
-20
lines changed

4 files changed

+20
-20
lines changed

src/client.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ impl Client {
4141
let response = crate::packet::parse(&mut self.stream)?;
4242
if let Packet::Result { message, success } = response {
4343
if !success {
44-
eprintln!("Unlocking failed. It is likely that a wrong passphrase was entered. Received from daemon: {}", message);
44+
eprintln!("Unlocking failed. It is likely that a wrong passphrase was entered. Received from daemon: {message}");
4545
}
4646
} else {
4747
eprintln!("Received an unexpected return value from daemon.");
@@ -64,7 +64,7 @@ impl Client {
6464
let response = crate::packet::parse(&mut self.stream)?;
6565
if let Packet::Result { message, success } = response {
6666
if !success {
67-
eprintln!("Storing the credential failed. You may need to `nicator unlock`. Received from daemon: {}", message);
67+
eprintln!("Storing the credential failed. You may need to `nicator unlock`. Received from daemon: {message}");
6868
}
6969
} else {
7070
eprintln!("Received an unexpected return value from daemon.");

src/lib.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
use std::{io::Read, path::PathBuf};
22

3-
use clap::{crate_authors, crate_version, Arg, ArgMatches, Command, ArgAction};
3+
use clap::{crate_authors, crate_version, Arg, ArgAction, ArgMatches, Command};
44
use client::Client;
55
use secstr::SecUtf8;
66
use thiserror::Error;
@@ -85,7 +85,7 @@ impl ProgramOptions {
8585
return PathBuf::from(path);
8686
}
8787
let uid = nix::unistd::getuid();
88-
let file_name = format!("/tmp/nicator-{}.sock", uid);
88+
let file_name = format!("/tmp/nicator-{uid}.sock");
8989
PathBuf::from(file_name)
9090
}
9191

@@ -162,7 +162,7 @@ pub fn run() -> Exit {
162162
match options {
163163
Ok(options) => perform_command(name, options),
164164
Err(err) => {
165-
eprintln!("Failed to determine arguments. {}", err);
165+
eprintln!("Failed to determine arguments. {err}");
166166
Exit::Failure
167167
}
168168
}
@@ -250,8 +250,8 @@ fn perform_unlock(options: &ProgramOptions) -> Exit {
250250
}),
251251
Err(err) => {
252252
eprintln!(
253-
"Failed to canonicalize store path {:?}: {}",
254-
options.store, err
253+
"Failed to canonicalize store path {:?}: {err}",
254+
options.store
255255
);
256256
Exit::Failure
257257
}
@@ -320,7 +320,7 @@ fn perform_export(options: &ProgramOptions) -> Exit {
320320
}
321321
}
322322
Err(err) => {
323-
eprintln!("Failed to export credentials: {}", err);
323+
eprintln!("Failed to export credentials: {err}");
324324
return Exit::Failure;
325325
}
326326
}
@@ -361,13 +361,13 @@ fn perform_import(options: &ProgramOptions) -> Exit {
361361
match store.encrypt_at(&options.store, passphrase.unsecure()) {
362362
Ok(_) => Exit::Success,
363363
Err(err) => {
364-
eprintln!("Failed to store imported credentials. {}", err);
364+
eprintln!("Failed to store imported credentials. {err}");
365365
Exit::Failure
366366
}
367367
}
368368
}
369369
Err(err) => {
370-
eprintln!("Failed to import credentials: {}", err);
370+
eprintln!("Failed to import credentials: {err}");
371371
Exit::Failure
372372
}
373373
}

src/server.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -106,14 +106,14 @@ impl Daemon {
106106
self.passphrase = Some(passphrase);
107107
self.timeout = Duration::from_secs(timeout);
108108
let response = Packet::Result {
109-
message: "".to_string(),
109+
message: String::new(),
110110
success: true,
111111
};
112112
crate::packet::write(conn, &response)?;
113113
}
114114
Err(err) => {
115115
let response = Packet::Result {
116-
message: format!("{}", err),
116+
message: format!("{err}"),
117117
success: false,
118118
};
119119
crate::packet::write(conn, &response)?;
@@ -136,14 +136,14 @@ impl Daemon {
136136
match result {
137137
Ok(_) => {
138138
let response = Packet::Result {
139-
message: "".to_string(),
139+
message: String::new(),
140140
success: true,
141141
};
142142
crate::packet::write(conn, &response)?;
143143
}
144144
Err(err) => {
145145
let response = Packet::Result {
146-
message: format!("{}", err),
146+
message: format!("{err}"),
147147
success: false,
148148
};
149149
crate::packet::write(conn, &response)?;
@@ -190,7 +190,7 @@ impl Daemon {
190190
}
191191
Err(err) => {
192192
let response = Packet::Result {
193-
message: format!("{}", err),
193+
message: format!("{err}"),
194194
success: false,
195195
};
196196
crate::packet::write(conn, &response)?;
@@ -225,14 +225,14 @@ impl Daemon {
225225
match result {
226226
Ok(_) => {
227227
let response = Packet::Result {
228-
message: "".to_string(),
228+
message: String::new(),
229229
success: true,
230230
};
231231
crate::packet::write(conn, &response)?;
232232
}
233233
Err(err) => {
234234
let response = Packet::Result {
235-
message: format!("{}", err),
235+
message: format!("{err}"),
236236
success: false,
237237
};
238238
crate::packet::write(conn, &response)?;
@@ -264,7 +264,7 @@ pub fn launch<P: AsRef<Path>>(socket_path: P) -> Result<(), crate::Error> {
264264
let mut daemon = Daemon::new(&socket_path)?;
265265
match daemon.main_loop(socket_path.as_ref()) {
266266
Ok(_) => println!("nicator server exiting"),
267-
Err(err) => eprintln!("nicator server had an error: {}", err),
267+
Err(err) => eprintln!("nicator server had an error: {err}"),
268268
}
269269
std::fs::remove_file(socket_path)?;
270270
Ok(())

src/store.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ impl Credential {
6060
/// If the url is not valid.
6161
pub fn from_url(url_str: &str) -> Result<Credential, url::ParseError> {
6262
let url = url::Url::parse(url_str)?;
63-
let port = url.port().map_or(String::new(), |p| format!(":{}", p));
63+
let port = url.port().map_or(String::new(), |p| format!(":{p}"));
6464
Ok(Credential {
6565
host: url.host_str().unwrap_or("").to_string() + &port,
6666
// leading slash is not required for git
@@ -255,7 +255,7 @@ mod tests {
255255
super::Credential {
256256
host: "host2".to_string(),
257257
password: SecUtf8::from("pw2"),
258-
path: "".to_string(),
258+
path: String::new(),
259259
protocol: "protocol2".to_string(),
260260
username: "user2".to_string(),
261261
},

0 commit comments

Comments
 (0)