From b940acce5e7008c7ccbc4751f68141c947587476 Mon Sep 17 00:00:00 2001
From: Benjamin Saunders <ben.e.saunders@gmail.com>
Date: Wed, 20 May 2020 19:18:09 -0700
Subject: [PATCH] Improve concision

---
 rustls/src/client/hs.rs    | 7 ++-----
 rustls/src/client/tls13.rs | 9 ++-------
 rustls/src/server/tls13.rs | 4 +---
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/rustls/src/client/hs.rs b/rustls/src/client/hs.rs
index 4bee5d57..ef28fa43 100644
--- a/rustls/src/client/hs.rs
+++ b/rustls/src/client/hs.rs
@@ -25,10 +25,7 @@ use crate::log::{debug, trace};
 use crate::error::TLSError;
 use crate::handshake::check_handshake_message;
 #[cfg(feature = "quic")]
-use crate::{
-    msgs::base::PayloadU16,
-    session::Protocol
-};
+use crate::msgs::base::PayloadU16;
 
 use crate::client::common::{ServerCertDetails, HandshakeDetails};
 use crate::client::common::{ClientHelloDetails, ReceivedTicketDetails};
@@ -112,7 +109,7 @@ fn find_session(sess: &mut ClientSessionImpl, dns_name: webpki::DNSNameRef)
             None
         } else {
             #[cfg(feature = "quic")] {
-                if sess.common.protocol == Protocol::Quic {
+                if sess.common.is_quic() {
                     let params = PayloadU16::read(&mut reader)?;
                     sess.common.quic.params = Some(params.0);
                 }
diff --git a/rustls/src/client/tls13.rs b/rustls/src/client/tls13.rs
index ad288450..c2de45d7 100644
--- a/rustls/src/client/tls13.rs
+++ b/rustls/src/client/tls13.rs
@@ -305,9 +305,7 @@ pub fn prepare_resumption(sess: &mut ClientSessionImpl,
 }
 
 pub fn emit_fake_ccs(hs: &mut HandshakeDetails, sess: &mut ClientSessionImpl) {
-    #[cfg(feature = "quic")] {
-        if let Protocol::Quic = sess.common.protocol { return; }
-    }
+    if sess.common.is_quic() { return; }
 
     if hs.sent_tls13_fake_ccs {
         return;
@@ -784,10 +782,7 @@ fn emit_finished_tls13(handshake: &mut HandshakeDetails,
 
 fn emit_end_of_early_data_tls13(handshake: &mut HandshakeDetails,
                                 sess: &mut ClientSessionImpl) {
-    #[cfg(feature = "quic")]
-    {
-        if let Protocol::Quic = sess.common.protocol { return; }
-    }
+    if sess.common.is_quic() { return; }
 
     let m = Message {
         typ: ContentType::Handshake,
diff --git a/rustls/src/server/tls13.rs b/rustls/src/server/tls13.rs
index 9a2fe6f1..6e912d6e 100644
--- a/rustls/src/server/tls13.rs
+++ b/rustls/src/server/tls13.rs
@@ -211,9 +211,7 @@ impl CompleteClientHelloHandling {
 
     fn emit_fake_ccs(&mut self,
                      sess: &mut ServerSessionImpl) {
-        #[cfg(feature = "quic")] {
-            if let Protocol::Quic = sess.common.protocol { return; }
-        }
+        if sess.common.is_quic() { return; }
         let m = Message {
             typ: ContentType::ChangeCipherSpec,
             version: ProtocolVersion::TLSv1_2,