fmt

Author: 0x676e67

src/client/http/connect/connector.rs

@@ -269,7 +269,7 @@ impl ConnectorService {
             http.set_nodelay(true);
         }
 
-        let mut connector = self.build_tls_connector(http, req.ex_data())?;
+        let mut connector = self.build_tls_connector(http, req.metadata())?;
         let io = connector.call(req).await?;
 
         // If the connection is HTTPS, wrap the TLS stream in a TlsConn for unified handling.
@@ -327,7 +327,7 @@ impl ConnectorService {
 
                     // Create a TLS connector for the established connection.
                     let mut connector =
-                        self.build_tls_connector(self.http.clone(), req.ex_data())?;
+                        self.build_tls_connector(self.http.clone(), req.metadata())?;
                     let established_conn = EstablishedConn::new(req, conn);
                     let io = connector.call(established_conn).await?;
 
@@ -349,7 +349,7 @@ impl ConnectorService {
             trace!("tunneling HTTPS over HTTP proxy: {:?}", proxy_uri);
 
             // Create a tunnel connector with the proxy URI and the HTTP connector.
-            let mut connector = self.build_tls_connector(self.http.clone(), req.ex_data())?;
+            let mut connector = self.build_tls_connector(self.http.clone(), req.metadata())?;
             let mut tunnel = proxy::tunnel::TunnelConnector::new(proxy_uri, connector.clone());
 
             // If the proxy has basic authentication, add it to the tunnel.
@@ -391,8 +391,8 @@ impl ConnectorService {
         debug!("starting new connection: {:?}", req.uri());
 
         let intercepted = req
-            .ex_data()
-            .proxy()
+            .metadata()
+            .proxy_matcher()
             .and_then(|prox| prox.intercept(req.uri()))
             .or_else(|| {
                 self.config

src/core/client/service/meta.rs

@@ -42,7 +42,7 @@ impl ConnectMeta {
     }
 
     /// Return the negotiated [`AlpnProtocol`].
-    pub(crate) fn alpn(&self) -> Option<AlpnProtocol> {
+    pub(crate) fn alpn_protocol(&self) -> Option<AlpnProtocol> {
         match self
             .options
             .as_ref()
@@ -58,7 +58,7 @@ impl ConnectMeta {
 
     /// Return a reference to the [`ProxyMacher`].
     #[inline]
-    pub(crate) fn proxy(&self) -> Option<&ProxyMacher> {
+    pub(crate) fn proxy_matcher(&self) -> Option<&ProxyMacher> {
         self.options
             .as_ref()
             .and_then(RequestOptions::proxy_matcher)

src/core/client/service/mod.rs

@@ -72,7 +72,7 @@ impl ConnectRequest {
 
     /// Returns the [`ConnectMeta`] connection parameters (ALPN, proxy, TCP/TLS options).
     #[inline]
-    pub(crate) fn ex_data(&self) -> &ConnectMeta {
+    pub(crate) fn metadata(&self) -> &ConnectMeta {
         self.extra.as_ref().as_ref()
     }
 
@@ -428,7 +428,7 @@ where
 
         let h1_builder = self.h1_builder.clone();
         let h2_builder = self.h2_builder.clone();
-        let ver = match req.ex_data().alpn() {
+        let ver = match req.metadata().alpn_protocol() {
             Some(AlpnProtocol::HTTP2) => Ver::Http2,
             _ => self.config.ver,
         };

src/tls/conn/mod.rs

@@ -226,7 +226,7 @@ impl Inner {
         )?;
 
         // Set ALPN protocols
-        if let Some(alpn) = req.ex_data().alpn() {
+        if let Some(alpn) = req.metadata().alpn_protocol() {
             cfg.set_alpn_protos(&alpn.encode())?;
         }