clippy

diff --git a/Cargo.toml b/Cargo.toml
index 1805a8ca0b6f1d7e248ffc86f03c47226f66fdaf..53ab29173edfa3af4264a311d2cac99dc4a5b639 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,4 +12,4 @@ tokio = { version = "1.23.0", features = ["sync", "time", "net", "signal", "macr
 
 [dev-dependencies]
 pretty-hex = "0.3.0"
-tokio = { features = ["rt-multi-thread"] }
+tokio = { version = "1.23.0", features = ["rt-multi-thread"] }

diff --git a/src/client.rs b/src/client.rs
index e6d7e75eeb0aada05ecef007b9ec76c3b0bfc292..6785a1f0f964f034317c2962274ca3809e6c8d09 100644 (file)
--- a/src/client.rs
+++ b/src/client.rs
@@ -36,7 +36,7 @@ pub async fn connect(addr: &str) -> io::Result<(RudpSender<Sender>, RudpReceiver
     let sock = Arc::new(net::UdpSocket::bind("0.0.0.0:0").await?);
     sock.connect(addr).await?;
 
-    Ok(new(
+    new(
         PeerID::Srv as u16,
         PeerID::Nil as u16,
         Sender {
@@ -44,5 +44,5 @@ pub async fn connect(addr: &str) -> io::Result<(RudpSender<Sender>, RudpReceiver
         },
         Receiver { sock },
     )
-    .await?)
+    .await
 }

diff --git a/src/error.rs b/src/error.rs
index e0481205b071f3ff7ea739fbec486e31644fe71d..55566fafa2c5f42594395de599b2b07146d3104f 100644 (file)
--- a/src/error.rs
+++ b/src/error.rs
@@ -47,7 +47,7 @@ impl fmt::Display for Error {
         write!(f, "rudp: ")?;
 
         match self {
-            IoError(err) => write!(f, "IO error: {}", err),
+            IoError(err) => write!(f, "IO error: {err}"),
             InvalidProtoId(id) => write!(f, "invalid protocol ID: {id}"),
             InvalidChannel(ch) => write!(f, "invalid channel: {ch}"),
             InvalidType(tp) => write!(f, "invalid type: {tp}"),

diff --git a/src/recv.rs b/src/recv.rs
index e3d3e6b68c1c43ad08132e51427000813ee1536d..e685c9c518e58058b63ad20313e14b82fadabdc2 100644 (file)
--- a/src/recv.rs
+++ b/src/recv.rs
@@ -82,6 +82,7 @@ impl<R: UdpReceiver, S: UdpSender> RecvWorker<R, S> {
                     self.pkt_tx.send(Err(RemoteDisco(to))).ok();
                 }
 
+                #[allow(clippy::single_match)]
                 match e {
                                        // anon5's mt notifies the peer on timeout, C++ MT does not
                                        LocalDisco /*| RemoteDisco(true)*/ => drop(

diff --git a/src/send.rs b/src/send.rs
index c41ad806494ff17099e7e8df8cedf95b8fe6f9e3..3ec3c64f1f4e248e5e285e9f689677930f483876 100644 (file)
--- a/src/send.rs
+++ b/src/send.rs
@@ -12,11 +12,12 @@ impl<S: UdpSender> RudpSender<S> {
 }
 
 impl<S: UdpSender> RudpShare<S> {
+    #[allow(clippy::unused_io_amount)]
     pub async fn send(&self, tp: PktType, pkt: Pkt<&[u8]>) -> AckResult {
         let mut buf = Vec::with_capacity(4 + 2 + 1 + 1 + 2 + 1 + pkt.data.len());
         buf.write_u32::<BigEndian>(PROTO_ID)?;
         buf.write_u16::<BigEndian>(*self.remote_id.read().await)?;
-        buf.write_u8(pkt.chan as u8)?;
+        buf.write_u8(pkt.chan)?;
 
         let mut chan = self.chans[pkt.chan as usize].lock().await;
         let seqnum = chan.seqnum;