From 309d438ac44cc577d4e6f5937645ecaae85c2044 Mon Sep 17 00:00:00 2001 From: Benjamin Saunders Date: Sat, 30 Mar 2019 17:10:38 -0700 Subject: [PATCH] Style cleanup --- quinn-proto/src/connection.rs | 6 ++---- quinn-proto/src/packet.rs | 6 +++++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/quinn-proto/src/connection.rs b/quinn-proto/src/connection.rs index c00919a08..bf866f963 100644 --- a/quinn-proto/src/connection.rs +++ b/quinn-proto/src/connection.rs @@ -2155,10 +2155,8 @@ impl Connection { } } _ => { - let id = SpaceId::VALUES - .iter() - .find(|&&x| self.space(x).crypto.is_some() && self.space(x).can_send()) - .cloned() + let id = SpaceId::iter() + .find(|&x| self.space(x).crypto.is_some() && self.space(x).can_send()) .or_else(|| { if self.space(SpaceId::Data).crypto.is_some() && self.can_send_1rtt() { Some(SpaceId::Data) diff --git a/quinn-proto/src/packet.rs b/quinn-proto/src/packet.rs index eb2d77872..d3cc79c82 100644 --- a/quinn-proto/src/packet.rs +++ b/quinn-proto/src/packet.rs @@ -797,7 +797,11 @@ pub enum SpaceId { } impl SpaceId { - pub const VALUES: [Self; 3] = [SpaceId::Initial, SpaceId::Handshake, SpaceId::Data]; + pub fn iter() -> impl Iterator { + [SpaceId::Initial, SpaceId::Handshake, SpaceId::Data] + .into_iter() + .cloned() + } } impl slog::Value for SpaceId {