remove deprecated on_connect methods (#1857)

actix-http/src/h2/dispatcher.rs

@@ -18,7 +18,6 @@ use crate::body::{BodySize, MessageBody, ResponseBody};
 use crate::cloneable::CloneableService;
 use crate::config::ServiceConfig;
 use crate::error::{DispatchError, Error};
-use crate::helpers::DataFactory;
 use crate::httpmessage::HttpMessage;
 use crate::message::ResponseHead;
 use crate::payload::Payload;
@@ -36,7 +35,6 @@ where
 {
     service: CloneableService<S>,
     connection: Connection<T, Bytes>,
-    on_connect: Option<Box<dyn DataFactory>>,
     on_connect_data: Extensions,
     config: ServiceConfig,
     peer_addr: Option<net::SocketAddr>,
@@ -57,7 +55,6 @@ where
     pub(crate) fn new(
         service: CloneableService<S>,
         connection: Connection<T, Bytes>,
-        on_connect: Option<Box<dyn DataFactory>>,
         on_connect_data: Extensions,
         config: ServiceConfig,
         timeout: Option<Delay>,
@@ -84,7 +81,6 @@ where
             config,
             peer_addr,
             connection,
-            on_connect,
             on_connect_data,
             ka_expire,
             ka_timer,
@@ -134,12 +130,6 @@ where
                     head.headers = parts.headers.into();
                     head.peer_addr = this.peer_addr;
 
-                    // DEPRECATED
-                    // set on_connect data
-                    if let Some(ref on_connect) = this.on_connect {
-                        on_connect.set(&mut req.extensions_mut());
-                    }
-
                     // merge on_connect_ext data into request extensions
                     req.extensions_mut().drain_from(&mut this.on_connect_data);
 

actix-http/src/h2/service.rs

@@ -20,7 +20,6 @@ use crate::body::MessageBody;
 use crate::cloneable::CloneableService;
 use crate::config::ServiceConfig;
 use crate::error::{DispatchError, Error};
-use crate::helpers::DataFactory;
 use crate::request::Request;
 use crate::response::Response;
 use crate::{ConnectCallback, Extensions};
@@ -31,7 +30,6 @@ use super::dispatcher::Dispatcher;
 pub struct H2Service<T, S, B> {
     srv: S,
     cfg: ServiceConfig,
-    on_connect: Option<Rc<dyn Fn(&T) -> Box<dyn DataFactory>>>,
     on_connect_ext: Option<Rc<ConnectCallback<T>>>,
     _t: PhantomData<(T, B)>,
 }
@@ -51,23 +49,12 @@ where
     ) -> Self {
         H2Service {
             cfg,
-            on_connect: None,
             on_connect_ext: None,
             srv: service.into_factory(),
             _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 on connect callback.
     pub(crate) fn on_connect_ext(mut self, f: Option<Rc<ConnectCallback<T>>>) -> Self {
         self.on_connect_ext = f;
@@ -212,7 +199,6 @@ where
         H2ServiceResponse {
             fut: self.srv.new_service(()),
             cfg: Some(self.cfg.clone()),
-            on_connect: self.on_connect.clone(),
             on_connect_ext: self.on_connect_ext.clone(),
             _t: PhantomData,
         }
@@ -225,7 +211,6 @@ pub struct H2ServiceResponse<T, S: ServiceFactory, B> {
     #[pin]
     fut: S::Future,
     cfg: Option<ServiceConfig>,
-    on_connect: Option<Rc<dyn Fn(&T) -> Box<dyn DataFactory>>>,
     on_connect_ext: Option<Rc<ConnectCallback<T>>>,
     _t: PhantomData<(T, B)>,
 }
@@ -248,7 +233,6 @@ where
             let this = self.as_mut().project();
             H2ServiceHandler::new(
                 this.cfg.take().unwrap(),
-                this.on_connect.clone(),
                 this.on_connect_ext.clone(),
                 service,
             )
@@ -260,7 +244,6 @@ where
 pub struct H2ServiceHandler<T, S: Service, B> {
     srv: CloneableService<S>,
     cfg: ServiceConfig,
-    on_connect: Option<Rc<dyn Fn(&T) -> Box<dyn DataFactory>>>,
     on_connect_ext: Option<Rc<ConnectCallback<T>>>,
     _t: PhantomData<(T, B)>,
 }
@@ -275,13 +258,11 @@ where
 {
     fn new(
         cfg: ServiceConfig,
-        on_connect: Option<Rc<dyn Fn(&T) -> Box<dyn DataFactory>>>,
         on_connect_ext: Option<Rc<ConnectCallback<T>>>,
         srv: S,
     ) -> H2ServiceHandler<T, S, B> {
         H2ServiceHandler {
             cfg,
-            on_connect,
             on_connect_ext,
             srv: CloneableService::new(srv),
             _t: PhantomData,
@@ -312,8 +293,6 @@ where
     }
 
     fn call(&mut self, (io, addr): Self::Request) -> Self::Future {
-        let deprecated_on_connect = self.on_connect.as_ref().map(|handler| handler(&io));
-
         let mut connect_extensions = Extensions::new();
         if let Some(ref handler) = self.on_connect_ext {
             // run on_connect_ext callback, populating connect extensions
@@ -325,7 +304,6 @@ where
                 Some(self.srv.clone()),
                 Some(self.cfg.clone()),
                 addr,
-                deprecated_on_connect,
                 Some(connect_extensions),
                 server::handshake(io),
             ),
@@ -343,7 +321,6 @@ where
         Option<CloneableService<S>>,
         Option<ServiceConfig>,
         Option<net::SocketAddr>,
-        Option<Box<dyn DataFactory>>,
         Option<Extensions>,
         Handshake<T, Bytes>,
     ),
@@ -379,7 +356,6 @@ where
                 ref mut srv,
                 ref mut config,
                 ref peer_addr,
-                ref mut on_connect,
                 ref mut on_connect_data,
                 ref mut handshake,
             ) => match Pin::new(handshake).poll(cx) {
@@ -387,7 +363,6 @@ where
                     self.state = State::Incoming(Dispatcher::new(
                         srv.take().unwrap(),
                         conn,
-                        on_connect.take(),
                         on_connect_data.take().unwrap(),
                         config.take().unwrap(),
                         None,