aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReiner Herrmann <reiner@reiner-h.de>2022-05-01 15:48:04 +0200
committerReiner Herrmann <reiner@reiner-h.de>2022-05-01 15:48:04 +0200
commit5c8239ae1b1fc5b71d7020a23a944052af452709 (patch)
treeaa55e781c2610c066de218c5c33cdaf3a62aa0af
parentc5df3980491b628f637252cb2db202f8a4262cd0 (diff)
Fix clippy warnings and ignore two others
-rw-r--r--src/lib.rs1
-rw-r--r--src/tftpc.rs1
-rw-r--r--src/tftpd.rs6
3 files changed, 5 insertions, 3 deletions
diff --git a/src/lib.rs b/src/lib.rs
index d9feeaf..ba633a5 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -352,6 +352,7 @@ impl Tftp {
let mut options = HashMap::new();
let mut pos = 0;
+ #[allow(clippy::while_let_loop)]
loop {
let key = match self.get_tftp_str(&buf[pos..]) {
Some(k) => k,
diff --git a/src/tftpc.rs b/src/tftpc.rs
index 453837c..89937c2 100644
--- a/src/tftpc.rs
+++ b/src/tftpc.rs
@@ -15,6 +15,7 @@ use getopts::Options;
extern crate rtftp;
+#[allow(clippy::upper_case_acronyms)]
enum Operation {
RRQ,
WRQ,
diff --git a/src/tftpd.rs b/src/tftpd.rs
index 47c225f..fea9d85 100644
--- a/src/tftpd.rs
+++ b/src/tftpd.rs
@@ -154,12 +154,12 @@ impl Tftpd {
let mut file = match File::open(&path) {
Ok(f) => f,
Err(ref error) if error.kind() == io::ErrorKind::NotFound => {
- let err = format!("Sending {} to {} failed ({}).", path.display(), cl, error.to_string());
+ let err = format!("Sending {} to {} failed ({}).", path.display(), cl, error);
self.tftp.send_error(socket, 1, "File not found")?;
return Err(io::Error::new(io::ErrorKind::NotFound, err));
}
Err(error) => {
- let err = format!("Sending {} to {} failed ({}).", path.display(), cl, error.to_string());
+ let err = format!("Sending {} to {} failed ({}).", path.display(), cl, error);
self.tftp.send_error(socket, 2, "Permission denied")?;
return Err(io::Error::new(io::ErrorKind::PermissionDenied, err));
}
@@ -176,7 +176,7 @@ impl Tftpd {
match self.tftp.send_file(socket, &mut file) {
Ok(_) => Ok(format!("Sent {} to {}.", path.display(), cl)),
Err(err) => {
- let error = format!("Sending {} to {} failed ({}).", path.display(), cl, err.to_string());
+ let error = format!("Sending {} to {} failed ({}).", path.display(), cl, err);
Err(std::io::Error::new(err.kind(), error))
}
}