From 7b79af211a14cc1b6286860e2dbdfdbb6937fad0 Mon Sep 17 00:00:00 2001 From: Benjamin Saunders Date: Thu, 10 Feb 2022 18:00:47 -0800 Subject: [PATCH] Remove superfluous Result --- quinn-proto/src/connection/mod.rs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/quinn-proto/src/connection/mod.rs b/quinn-proto/src/connection/mod.rs index b7ecb432a..d2f381a1c 100644 --- a/quinn-proto/src/connection/mod.rs +++ b/quinn-proto/src/connection/mod.rs @@ -2504,7 +2504,7 @@ impl Connection { if self.side.is_server() && self.rem_cids.active_seq() == 0 { // We're a server still using the initial remote CID for the client, so // let's switch immediately to enable clientside stateless resets. - let _ = self.update_rem_cid(); + self.update_rem_cid(); } } Frame::NewToken { token } => { @@ -2573,7 +2573,7 @@ impl Connection { ); self.migrate(now, remote); // Break linkability, if possible - let _ = self.update_rem_cid(); + self.update_rem_cid(); self.spin = false; } @@ -2614,15 +2614,17 @@ impl Connection { ); } - /// Returns Err(()) if no CIDs were available - fn update_rem_cid(&mut self) -> Result<(), ()> { - let (reset_token, retired) = self.rem_cids.next().ok_or(())?; + /// Switch to a previously unused remote connection ID, if possible + fn update_rem_cid(&mut self) { + let (reset_token, retired) = match self.rem_cids.next() { + Some(x) => x, + None => return, + }; // Retire the current remote CID and any CIDs we had to skip. let retire_cids = &mut self.spaces[SpaceId::Data].pending.retire_cids; retire_cids.extend(retired); self.set_reset_token(reset_token); - Ok(()) } fn set_reset_token(&mut self, reset_token: ResetToken) {