From 98e2c26325be65dffaf366c4cf5fff05cf62c09f Mon Sep 17 00:00:00 2001 From: Dirkjan Ochtman Date: Tue, 2 Dec 2025 12:29:20 +0100 Subject: [PATCH] proto: use new constructor where possible --- quinn-proto/src/connection/mod.rs | 30 ++++++++++++------------------ quinn-proto/src/transport_error.rs | 7 +------ 2 files changed, 13 insertions(+), 24 deletions(-) diff --git a/quinn-proto/src/connection/mod.rs b/quinn-proto/src/connection/mod.rs index 1060a894c..4053c78ab 100644 --- a/quinn-proto/src/connection/mod.rs +++ b/quinn-proto/src/connection/mod.rs @@ -2598,15 +2598,12 @@ impl Connection { if self.side.is_client() { // Client-only because server params were set from the client's Initial - let params = - self.crypto - .transport_parameters()? - .ok_or_else(|| TransportError { - code: TransportErrorCode::crypto(0x6d), - frame: None, - reason: "transport parameters missing".into(), - crypto: None, - })?; + let params = self.crypto.transport_parameters()?.ok_or_else(|| { + TransportError::new( + TransportErrorCode::crypto(0x6d), + "transport parameters missing".to_owned(), + ) + })?; if self.has_0rtt() { if !self.crypto.early_data_accepted().unwrap() { @@ -2674,15 +2671,12 @@ impl Connection { && starting_space == SpaceId::Initial && self.highest_space != SpaceId::Initial { - let params = - self.crypto - .transport_parameters()? - .ok_or_else(|| TransportError { - code: TransportErrorCode::crypto(0x6d), - frame: None, - reason: "transport parameters missing".into(), - crypto: None, - })?; + let params = self.crypto.transport_parameters()?.ok_or_else(|| { + TransportError::new( + TransportErrorCode::crypto(0x6d), + "transport parameters missing".to_owned(), + ) + })?; self.handle_peer_params(params)?; self.issue_first_cids(now); self.init_0rtt(); diff --git a/quinn-proto/src/transport_error.rs b/quinn-proto/src/transport_error.rs index b29a854b9..af6282fa3 100644 --- a/quinn-proto/src/transport_error.rs +++ b/quinn-proto/src/transport_error.rs @@ -103,12 +103,7 @@ macro_rules! errors { impl Error { $( pub(crate) fn $name(reason: T) -> Self where T: Into { - Self { - code: Code::$name, - frame: None, - reason: reason.into(), - crypto: None, - } + Self::new(Code::$name, reason.into()) } )* }