remove deprecated on_connect methods (#1857)

actix-http/src/service.rs

@@ -17,7 +17,6 @@ use crate::builder::HttpServiceBuilder;
 use crate::cloneable::CloneableService;
 use crate::config::{KeepAlive, ServiceConfig};
 use crate::error::{DispatchError, Error};
-use crate::helpers::DataFactory;
 use crate::request::Request;
 use crate::response::Response;
 use crate::{h1, h2::Dispatcher, ConnectCallback, Extensions, Protocol};
@@ -28,8 +27,6 @@ pub struct HttpService<T, S, B, X = h1::ExpectHandler, U = h1::UpgradeHandler<T>
     cfg: ServiceConfig,
     expect: X,
     upgrade: Option<U>,
-    // DEPRECATED: in favor of on_connect_ext
-    on_connect: Option<Rc<dyn Fn(&T) -> Box<dyn DataFactory>>>,
     on_connect_ext: Option<Rc<ConnectCallback<T>>>,
     _t: PhantomData<(T, B)>,
 }
@@ -67,7 +64,6 @@ where
             srv: service.into_factory(),
             expect: h1::ExpectHandler,
             upgrade: None,
-            on_connect: None,
             on_connect_ext: None,
             _t: PhantomData,
         }
@@ -83,7 +79,6 @@ where
             srv: service.into_factory(),
             expect: h1::ExpectHandler,
             upgrade: None,
-            on_connect: None,
             on_connect_ext: None,
             _t: PhantomData,
         }
@@ -116,7 +111,6 @@ where
             cfg: self.cfg,
             srv: self.srv,
             upgrade: self.upgrade,
-            on_connect: self.on_connect,
             on_connect_ext: self.on_connect_ext,
             _t: PhantomData,
         }
@@ -142,21 +136,11 @@ where
             cfg: self.cfg,
             srv: self.srv,
             expect: self.expect,
-            on_connect: self.on_connect,
             on_connect_ext: self.on_connect_ext,
             _t: PhantomData,
         }
     }
 
-    /// Set on connect callback.
-    pub(crate) fn on_connect(
-        mut self,
-        f: Option<Rc<dyn Fn(&T) -> Box<dyn DataFactory>>>,
-    ) -> Self {
-        self.on_connect = f;
-        self
-    }
-
     /// Set connect callback with mutable access to request data container.
     pub(crate) fn on_connect_ext(mut self, f: Option<Rc<ConnectCallback<T>>>) -> Self {
         self.on_connect_ext = f;
@@ -366,7 +350,6 @@ where
             fut_upg: self.upgrade.as_ref().map(|f| f.new_service(())),
             expect: None,
             upgrade: None,
-            on_connect: self.on_connect.clone(),
             on_connect_ext: self.on_connect_ext.clone(),
             cfg: self.cfg.clone(),
             _t: PhantomData,
@@ -391,7 +374,6 @@ pub struct HttpServiceResponse<
     fut_upg: Option<U::Future>,
     expect: Option<X::Service>,
     upgrade: Option<U::Service>,
-    on_connect: Option<Rc<dyn Fn(&T) -> Box<dyn DataFactory>>>,
     on_connect_ext: Option<Rc<ConnectCallback<T>>>,
     cfg: ServiceConfig,
     _t: PhantomData<(T, B)>,
@@ -451,7 +433,6 @@ where
                 service,
                 this.expect.take().unwrap(),
                 this.upgrade.take(),
-                this.on_connect.clone(),
                 this.on_connect_ext.clone(),
             )
         }))
@@ -464,7 +445,6 @@ pub struct HttpServiceHandler<T, S: Service, B, X: Service, U: Service> {
     expect: CloneableService<X>,
     upgrade: Option<CloneableService<U>>,
     cfg: ServiceConfig,
-    on_connect: Option<Rc<dyn Fn(&T) -> Box<dyn DataFactory>>>,
     on_connect_ext: Option<Rc<ConnectCallback<T>>>,
     _t: PhantomData<(T, B, X)>,
 }
@@ -486,12 +466,10 @@ where
         srv: S,
         expect: X,
         upgrade: Option<U>,
-        on_connect: Option<Rc<dyn Fn(&T) -> Box<dyn DataFactory>>>,
         on_connect_ext: Option<Rc<ConnectCallback<T>>>,
     ) -> HttpServiceHandler<T, S, B, X, U> {
         HttpServiceHandler {
             cfg,
-            on_connect,
             on_connect_ext,
             srv: CloneableService::new(srv),
             expect: CloneableService::new(expect),
@@ -564,7 +542,6 @@ where
     fn call(&mut self, (io, proto, peer_addr): Self::Request) -> Self::Future {
         let mut connect_extensions = Extensions::new();
 
-        let deprecated_on_connect = self.on_connect.as_ref().map(|handler| handler(&io));
         if let Some(ref handler) = self.on_connect_ext {
             handler(&io, &mut connect_extensions);
         }
@@ -575,7 +552,6 @@ where
                     server::handshake(io),
                     self.cfg.clone(),
                     self.srv.clone(),
-                    deprecated_on_connect,
                     connect_extensions,
                     peer_addr,
                 ))),
@@ -588,7 +564,6 @@ where
                     self.srv.clone(),
                     self.expect.clone(),
                     self.upgrade.clone(),
-                    deprecated_on_connect,
                     connect_extensions,
                     peer_addr,
                 )),
@@ -617,7 +592,6 @@ where
             Handshake<T, Bytes>,
             ServiceConfig,
             CloneableService<S>,
-            Option<Box<dyn DataFactory>>,
             Extensions,
             Option<net::SocketAddr>,
         )>,
@@ -694,12 +668,10 @@ where
                 } else {
                     panic!()
                 };
-                let (_, cfg, srv, on_connect, on_connect_data, peer_addr) =
-                    data.take().unwrap();
+                let (_, cfg, srv, on_connect_data, peer_addr) = data.take().unwrap();
                 self.set(State::H2(Dispatcher::new(
                     srv,
                     conn,
-                    on_connect,
                     on_connect_data,
                     cfg,
                     None,