From 03ba022258e2c62dd68ead0d86c5ce64ffe9cd72 Mon Sep 17 00:00:00 2001 From: Noah <33094578+coolreader18@users.noreply.github.com> Date: Sat, 21 Mar 2020 13:13:46 -0500 Subject: [PATCH] Don't use the matches!() macro --- vm/src/stdlib/ssl.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vm/src/stdlib/ssl.rs b/vm/src/stdlib/ssl.rs index 8a14428641..5ae84bc57c 100644 --- a/vm/src/stdlib/ssl.rs +++ b/vm/src/stdlib/ssl.rs @@ -38,7 +38,7 @@ mod sys { } } -#[derive(num_enum::IntoPrimitive, num_enum::TryFromPrimitive)] +#[derive(num_enum::IntoPrimitive, num_enum::TryFromPrimitive, PartialEq)] #[repr(i32)] enum SslVersion { Ssl2, @@ -58,7 +58,7 @@ enum CertRequirements { Required, } -#[derive(Debug)] +#[derive(Debug, PartialEq)] enum SslServerOrClient { Client, Server, @@ -192,7 +192,7 @@ impl PySslContext { }; let mut builder = SslContextBuilder::new(method).map_err(|e| convert_openssl_error(vm, e))?; - let check_hostname = matches!(proto, SslVersion::TlsClient); + let check_hostname = proto == SslVersion::TlsClient; builder.set_verify(if check_hostname { SslVerifyMode::PEER | SslVerifyMode::FAIL_IF_NO_PEER_CERT } else { @@ -420,7 +420,7 @@ impl PySslSocket { } #[pyproperty] fn server_side(&self) -> bool { - matches!(self.socket_type, SslServerOrClient::Server) + self.socket_type == SslServerOrClient::Server } #[pyproperty] fn context(&self) -> PyRef {