Simplify Session::request_port_forward impl

Remove `inner` for dedup monomorphization.

Signed-off-by: Jiahao XU <[email protected]>

Author: NobodyXu

src/native_mux_impl/session.rs

@@ -51,17 +51,13 @@ impl Session {
 
     pub(crate) async fn request_port_forward(
         &self,
-        forward_type: impl Into<ForwardType>,
-        listen_socket: impl Into<Socket<'_>>,
-        connect_socket: impl Into<Socket<'_>>,
+        forward_type: ForwardType,
+        listen_socket: Socket<'_>,
+        connect_socket: Socket<'_>,
     ) -> Result<(), Error> {
         Connection::connect(&self.ctl)
             .await?
-            .request_port_forward(
-                forward_type.into(),
-                &listen_socket.into(),
-                &connect_socket.into(),
-            )
+            .request_port_forward(forward_type, &listen_socket, &connect_socket)
             .await?;
 
         Ok(())

src/process_impl/session.rs

@@ -104,18 +104,18 @@ impl Session {
 
     pub(crate) async fn request_port_forward(
         &self,
-        forward_type: impl Into<ForwardType>,
-        listen_socket: impl Into<Socket<'_>>,
-        connect_socket: impl Into<Socket<'_>>,
+        forward_type: ForwardType,
+        listen_socket: Socket<'_>,
+        connect_socket: Socket<'_>,
     ) -> Result<(), Error> {
-        let flag = match forward_type.into() {
+        let flag = match forward_type {
             ForwardType::Local => OsStr::new("-L"),
             ForwardType::Remote => OsStr::new("-R"),
         };
 
-        let mut forwarding = listen_socket.into().as_os_str().into_owned();
+        let mut forwarding = listen_socket.as_os_str().into_owned();
         forwarding.push(":");
-        forwarding.push(connect_socket.into().as_os_str());
+        forwarding.push(connect_socket.as_os_str());
 
         let port_forwarding = self
             .new_cmd(&[OsStr::new("-fNT"), flag, &*forwarding])

src/session.rs

@@ -320,25 +320,14 @@ impl Session {
         listen_socket: impl Into<Socket<'_>>,
         connect_socket: impl Into<Socket<'_>>,
     ) -> Result<(), Error> {
-        async fn inner(
-            this: &Session,
-            forward_type: ForwardType,
-            listen_socket: Socket<'_>,
-            connect_socket: Socket<'_>,
-        ) -> Result<(), Error> {
-            delegate!(&this.0, imp, {
-                imp.request_port_forward(forward_type, listen_socket, connect_socket)
-                    .await
-            })
-        }
-
-        inner(
-            self,
-            forward_type.into(),
-            listen_socket.into(),
-            connect_socket.into(),
-        )
-        .await
+        delegate!(&self.0, imp, {
+            imp.request_port_forward(
+                forward_type.into().into(),
+                listen_socket.into().into(),
+                connect_socket.into().into(),
+            )
+            .await
+        })
     }
 
     /// Terminate the remote connection.