From cbab767d193588a4eb44212f6e79c32a7b5fd56a Mon Sep 17 00:00:00 2001
From: roblabla <unfiltered@roblab.la>
Date: Mon, 25 Apr 2022 16:03:00 +0200
Subject: [PATCH] Revert "fix: Return error on non https uri instead of panic
 (#838)"

This reverts commit ef6e245180936097e56f5f95ed8b182674f3131b.
---
 tonic/src/transport/service/connector.rs | 18 ------------------
 1 file changed, 18 deletions(-)

diff --git a/tonic/src/transport/service/connector.rs b/tonic/src/transport/service/connector.rs
index 9d49d3ec7..d0625ef0b 100644
--- a/tonic/src/transport/service/connector.rs
+++ b/tonic/src/transport/service/connector.rs
@@ -5,7 +5,6 @@ use super::tls::TlsConnector;
 use http::Uri;
 #[cfg(feature = "tls-roots-common")]
 use std::convert::TryInto;
-use std::fmt;
 use std::task::{Context, Poll};
 use tower::make::MakeConnection;
 use tower_service::Service;
@@ -79,8 +78,6 @@ where
         #[cfg(feature = "tls-roots-common")]
         let tls = self.tls_or_default(uri.scheme_str(), uri.host());
 
-        #[cfg(feature = "tls")]
-        let is_https = uri.scheme_str() == Some("https");
         let connect = self.inner.make_connection(uri);
 
         Box::pin(async move {
@@ -91,8 +88,6 @@ where
                 if let Some(tls) = tls {
                     let conn = tls.connect(io).await?;
                     return Ok(BoxedIo::new(conn));
-                } else if is_https {
-                    return Err(HttpsUriWithoutTlsSupport(()).into());
                 }
             }
 
@@ -100,16 +95,3 @@ where
         })
     }
 }
-
-/// Error returned when trying to connect to an HTTPS endpoint without TLS enabled.
-#[derive(Debug)]
-pub(crate) struct HttpsUriWithoutTlsSupport(());
-
-impl fmt::Display for HttpsUriWithoutTlsSupport {
-    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        write!(f, "Connecting to HTTPS without TLS enabled")
-    }
-}
-
-// std::error::Error only requires a type to impl Debug and Display
-impl std::error::Error for HttpsUriWithoutTlsSupport {}