From 400c0b1500f4859d734f39bc51ec22c456a00953 Mon Sep 17 00:00:00 2001 From: Monica Moniot Date: Thu, 26 Oct 2023 11:39:28 -0400 Subject: [PATCH] fixed tokio --- Cargo.toml | 2 +- src/tokio.rs | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 9d49e40..329912f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,7 +10,7 @@ path = "src/lib.rs" doc = true [features] -default = ["serde", "std"] +default = ["serde", "std", "tokio"] tokio = ["std", "dep:tokio"] std = [] diff --git a/src/tokio.rs b/src/tokio.rs index 74e2f21..dabdcec 100644 --- a/src/tokio.rs +++ b/src/tokio.rs @@ -5,7 +5,7 @@ use tokio::{ }; use crate::{ - error::{RecvError, TryError}, + error::{TryError, TryRecvError}, no_std::RecvOkRaw, Packet, SeqNo, TransportLayer, DEFAULT_INITIAL_SEQ_NO, DEFAULT_RESEND_INTERVAL_MS, DEFAULT_WINDOW_CAP, }; @@ -295,7 +295,7 @@ impl SeqEx { packet: Packet>, ) -> Result<(ReplyGuard<'_, TL, SendData, RecvData, CAP>, RecvData), Option> { let mut inner = self.inner.lock().unwrap(); - return match inner.seq.receive_raw(tl, packet) { + return match inner.seq.try_receive_raw(tl, packet) { Ok((recv_data, do_pump)) => { // pump first, handle return value second. let mut total_recv = 1; @@ -350,9 +350,9 @@ impl SeqEx { } ret } - Err(RecvError::DroppedTooEarly) => Err(Some(AsyncRecvError::DroppedTooEarly)), - Err(RecvError::DroppedDuplicate) => Err(Some(AsyncRecvError::DroppedDuplicate)), - Err(RecvError::WaitingForRecv) | Err(RecvError::WaitingForReply) => Err(None), + Err(TryRecvError::DroppedTooEarly) => Err(Some(AsyncRecvError::DroppedTooEarly)), + Err(TryRecvError::DroppedDuplicate) => Err(Some(AsyncRecvError::DroppedDuplicate)), + Err(TryRecvError::WaitingForRecv) | Err(TryRecvError::WaitingForReply) => Err(None), }; }