ssh: move sftp module to top level

was getting too deep in there!

wezterm-ssh/src/lib.rs

@@ -3,12 +3,14 @@ mod config;
 mod host;
 mod pty;
 mod session;
+mod sftp;
 
 pub use auth::*;
 pub use config::*;
 pub use host::*;
 pub use pty::*;
 pub use session::*;
+pub use sftp::*;
 
 // NOTE: Re-exported as is exposed in a public API of this crate
 pub use camino::{Utf8Path, Utf8PathBuf};

wezterm-ssh/src/session/inner.rs

@@ -1,12 +1,12 @@
 use crate::config::ConfigMap;
 use crate::pty::*;
-use crate::session::sftp::{
-    self, File, FileId, FileRequest, Metadata, SftpChannelError, SftpChannelResult, SftpRequest,
-};
 use crate::session::{
     ChannelWrap, Exec, ExecResult, FileWrap, SessionEvent, SessionRequest, SessionWrap,
     SignalChannel,
 };
+use crate::sftp::{
+    self, File, FileId, FileRequest, Metadata, SftpChannelError, SftpChannelResult, SftpRequest,
+};
 use anyhow::{anyhow, Context};
 use camino::Utf8PathBuf;
 use filedescriptor::{

wezterm-ssh/src/session/mod.rs

@@ -15,15 +15,9 @@ use std::collections::HashMap;
 use std::convert::TryFrom;
 use std::io::Write;
 use std::sync::{Arc, Mutex};
+use crate::sftp::{Metadata, Sftp, SftpChannelError, SftpChannelResult, SftpRequest};
 
 mod inner;
-mod sftp;
-
-use sftp::SftpRequest;
-pub use sftp::{
-    File, FilePermissions, FileType, Metadata, OpenFileType, OpenOptions, RenameOptions, Sftp,
-    SftpChannelError, SftpChannelResult, SftpError, SftpResult, WriteMode,
-};
 
 #[derive(Debug)]
 pub enum SessionEvent {