aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReiner Herrmann <reiner@reiner-h.de>2019-08-29 21:23:58 +0200
committerReiner Herrmann <reiner@reiner-h.de>2019-08-29 21:23:58 +0200
commit50e6a82f0955bf5d489d311f2c9600c379006c37 (patch)
treeade7192d81574333f7f646c3c7d47d7868d7449c
parentab017b1e36170e4bd9e5d8e0bd6454d966259e1c (diff)
Use dyn keyword for trait objects to fix deprecation warnings
-rw-r--r--src/lib.rs2
-rw-r--r--src/tftpd.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/lib.rs b/src/lib.rs
index 64291cb..6250722 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -163,7 +163,7 @@ impl Tftp {
/// This function will always fill the buffer completely (like expected from
/// read_exact), but also works with EOF, by filling the buffer partially and
/// returning the amount of bytes read.
- fn read_exact(&self, reader: &mut Read, buf: &mut [u8]) -> Result<usize, io::Error> {
+ fn read_exact(&self, reader: &mut dyn Read, buf: &mut [u8]) -> Result<usize, io::Error> {
let maxlen = buf.len();
let mut outbuf = Vec::with_capacity(maxlen);
let mut len = 0;
diff --git a/src/tftpd.rs b/src/tftpd.rs
index 638c5d5..5342145 100644
--- a/src/tftpd.rs
+++ b/src/tftpd.rs
@@ -206,7 +206,7 @@ impl Tftpd {
}
}
- fn drop_privs(&self, uid: u32, gid: u32) -> Result<(), Box<Error>> {
+ fn drop_privs(&self, uid: u32, gid: u32) -> Result<(), Box<dyn Error>> {
let root_uid = ROOT;
let root_gid = Gid::from_raw(0);
let unpriv_uid = Uid::from_raw(uid);