Rm API Session::force_terminate and mv its functionality

into `Session::close`

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

Author: NobodyXu

src/native_mux_impl/session.rs

@@ -82,6 +82,8 @@ impl Session {
             self.close_impl().await?;
 
             tempdir.close().map_err(Error::Cleanup)?;
+        } else {
+            self.close_impl().await?;
         }
 
         Ok(())
@@ -96,17 +98,6 @@ impl Session {
             }),
         )
     }
-
-    /// Forced termination, ignores value of `tempdir`
-    pub(crate) async fn force_terminate(self) -> Result<(), Error> {
-        if self.tempdir.is_some() {
-            self.close().await
-        } else {
-            self.close_impl().await?;
-
-            Ok(())
-        }
-    }
 }
 
 impl Drop for Session {

src/process_impl/session.rs

@@ -184,6 +184,8 @@ impl Session {
             self.close_impl().await?;
 
             tempdir.close().map_err(Error::Cleanup)?;
+        } else {
+            self.close_impl().await?;
         }
 
         Ok(())
@@ -194,17 +196,6 @@ impl Session {
         (self.ctl.clone(), self.master_log.take())
     }
 
-    /// Forced termination, ignores value of `tempdir`
-    pub(crate) async fn force_terminate(self) -> Result<(), Error> {
-        if self.tempdir.is_some() {
-            self.close().await
-        } else {
-            self.close_impl().await?;
-
-            Ok(())
-        }
-    }
-
     fn discover_master_error(&self) -> Option<Error> {
         let err = match fs::read_to_string(self.master_log.as_ref()?) {
             Ok(err) => err,

src/session.rs

@@ -328,10 +328,4 @@ impl Session {
     pub fn detach(self) -> (Box<Path>, Option<Box<Path>>) {
         delegate!(self.0, imp, { imp.detach() })
     }
-
-    /// Force terminate the remote connection, even if it is created
-    /// by [`Session::resume`] or [`Session::resume_mux`].
-    pub async fn force_terminate(self) -> Result<(), Error> {
-        delegate!(self.0, imp, { imp.force_terminate().await })
-    }
 }

tests/openssh.rs

@@ -865,7 +865,7 @@ async fn test_detach_and_resume_process_mux() {
         let session2 = Session::resume(ctl1, master_log1);
         session2.check().await.unwrap();
 
-        session2.force_terminate().await.unwrap();
+        session2.close().await.unwrap();
 
         // Wait for ssh multiplex master to clean up and exit.
         sleep(Duration::from_secs(3)).await;
@@ -910,7 +910,7 @@ async fn test_detach_and_resume_native_mux() {
         let session2 = Session::resume_mux(ctl1, master_log1);
         session2.check().await.unwrap();
 
-        session2.force_terminate().await.unwrap();
+        session2.close().await.unwrap();
 
         // Wait for ssh multiplex master to clean up and exit.
         sleep(Duration::from_secs(3)).await;