update

Author: 0x676e67

src/client/response.rs

@@ -421,7 +421,7 @@ impl Response {
 
     /// Consumes the response and returns a future for a possible HTTP upgrade.
     pub async fn upgrade(self) -> crate::Result<Upgraded> {
-        crate::core::upgrade::on(self.res)
+        crate::core::client::upgrade::on(self.res)
             .await
             .map(Upgraded::from)
             .map_err(Error::upgrade)

src/client/upgrade.rs

@@ -6,11 +6,11 @@ use std::{
 
 use tokio::io::{AsyncRead, AsyncWrite, ReadBuf};
 
-use crate::core::rt::TokioIo;
+use crate::core::{client::upgrade, rt::TokioIo};
 
 /// An upgraded HTTP connection.
 pub struct Upgraded {
-    inner: TokioIo<crate::core::upgrade::Upgraded>,
+    inner: TokioIo<upgrade::Upgraded>,
 }
 
 impl AsyncRead for Upgraded {
@@ -59,8 +59,8 @@ impl fmt::Debug for Upgraded {
     }
 }
 
-impl From<crate::core::upgrade::Upgraded> for Upgraded {
-    fn from(inner: crate::core::upgrade::Upgraded) -> Self {
+impl From<upgrade::Upgraded> for Upgraded {
+    fn from(inner: upgrade::Upgraded) -> Self {
         Upgraded {
             inner: TokioIo::new(inner),
         }

src/core/client/conn/http1.rs

@@ -296,7 +296,7 @@ impl Builder {
 
 mod upgrades {
     use super::*;
-    use crate::core::upgrade::Upgraded;
+    use crate::core::client::upgrade::Upgraded;
 
     // A future binding a connection with a Service with Upgrade support.
     //

src/core/client/mod.rs

@@ -10,6 +10,7 @@ mod service;
 pub mod conn;
 pub mod connect;
 pub mod options;
+pub mod upgrade;
 
 pub use self::body::Incoming;
 pub(crate) use self::service::meta::{ConnectMeta, Identifier};

src/core/client/proto/h1/conn.rs

@@ -21,6 +21,7 @@ use crate::core::{
     client::{
         body::DecodedLength,
         proto::{BodyLength, MessageHead, headers},
+        upgrade,
     },
     rt::{Read, Write},
 };
@@ -108,7 +109,7 @@ where
         self.io.into_inner()
     }
 
-    pub(crate) fn pending_upgrade(&mut self) -> Option<crate::core::upgrade::Pending> {
+    pub(crate) fn pending_upgrade(&mut self) -> Option<upgrade::Pending> {
         self.state.upgrade.take()
     }
 
@@ -763,7 +764,7 @@ where
         }
     }
 
-    pub(super) fn on_upgrade(&mut self) -> crate::core::upgrade::OnUpgrade {
+    pub(super) fn on_upgrade(&mut self) -> upgrade::OnUpgrade {
         trace!("{}: prepare possible HTTP upgrade", T::LOG);
         self.state.prepare_upgrade()
     }
@@ -807,7 +808,7 @@ struct State {
     /// State of allowed writes
     writing: Writing,
     /// An expected pending HTTP upgrade.
-    upgrade: Option<crate::core::upgrade::Pending>,
+    upgrade: Option<upgrade::Pending>,
     /// Either HTTP/1.0 or 1.1 connection
     version: Version,
     /// Flag to track if trailer fields are allowed to be sent
@@ -991,8 +992,8 @@ impl State {
         matches!(self.writing, Writing::Closed)
     }
 
-    fn prepare_upgrade(&mut self) -> crate::core::upgrade::OnUpgrade {
-        let (tx, rx) = crate::core::upgrade::pending();
+    fn prepare_upgrade(&mut self) -> upgrade::OnUpgrade {
+        let (tx, rx) = upgrade::pending();
         self.upgrade = Some(tx);
         rx
     }

src/core/client/proto/h1/dispatch.rs

@@ -16,10 +16,10 @@ use crate::core::{
         body::{self, DecodedLength, Incoming as IncomingBody},
         dispatch::{self, TrySendError},
         proto::{self, BodyLength, Conn, Dispatched, MessageHead, RequestHead},
+        upgrade::OnUpgrade,
     },
     error::BoxError,
     rt::{Read, Write},
-    upgrade::OnUpgrade,
 };
 
 pub(crate) struct Dispatcher<D, Bs: Body, I, T> {

src/core/client/proto/h2/client.rs

@@ -35,12 +35,12 @@ use crate::core::{
         bounds::Http2ClientConnExec,
         dispatch::{self, Callback, SendWhen, TrySendError},
         proto::{Dispatched, h2::UpgradedSendStream, headers},
+        upgrade::{self, Upgraded},
     },
     common::{io::Compat, time::Time},
     error::BoxError,
     ext::{RequestConfig, RequestExtendedConnectProtocol, RequestOriginalHeaders},
     rt::{Read, Write},
-    upgrade::Upgraded,
 };
 
 type ClientRx<B> = dispatch::Receiver<Request<B>, Response<IncomingBody>>;
@@ -484,7 +484,7 @@ where
                     let (parts, recv_stream) = res.into_parts();
                     let mut res = Response::from_parts(parts, IncomingBody::empty());
 
-                    let (pending, on_upgrade) = crate::core::upgrade::pending();
+                    let (pending, on_upgrade) = upgrade::pending();
                     let io = H2Upgraded {
                         ping,
                         send_stream: unsafe { UpgradedSendStream::new(send_stream) },

src/core/client/proto/mod.rs

@@ -3,10 +3,10 @@
 mod headers;
 
 pub(crate) mod h1;
+pub(crate) mod h2;
 
 pub(crate) use self::h1::{Conn, dispatch};
-
-pub(crate) mod h2;
+use crate::core::client::upgrade;
 
 /// An Incoming Message head. Includes request/status line, and headers.
 #[derive(Debug, Default)]
@@ -43,7 +43,7 @@ pub(crate) enum Dispatched {
     /// Dispatcher completely shutdown connection.
     Shutdown,
     /// Dispatcher has pending upgrade, and so did not shutdown.
-    Upgrade(crate::core::upgrade::Pending),
+    Upgrade(upgrade::Pending),
 }
 
 impl MessageHead<http::StatusCode> {

src/core/upgrade.rs src/core/client/upgrade.rssrc/core/upgrade.rs renamed to src/core/client/upgrade.rs

@@ -6,6 +6,5 @@ mod error;
 pub mod client;
 pub mod ext;
 pub mod rt;
-pub mod upgrade;
 
 pub use self::error::{Error, Result};