Refolder #2

src/algorithm/public_key/ed25519.rs

@@ -1,5 +1,5 @@
 use crate::algorithm::public_key::PublicKey;
-use crate::data::Data;
+use crate::model::Data;
 use crate::SshError;
 use ring::signature;
 

src/algorithm/public_key/rsa.rs

@@ -1,5 +1,5 @@
 use crate::algorithm::public_key::PublicKey as PubK;
-use crate::data::Data;
+use crate::model::Data;
 use crate::SshError;
 use rsa::PublicKey;
 

src/channel/channel.rs

@@ -3,8 +3,8 @@ use super::channel_scp::ChannelScp;
 use super::channel_shell::ChannelShell;
 use crate::client::Client;
 use crate::constant::ssh_msg_code;
-use crate::data::Data;
 use crate::error::{SshError, SshResult};
+use crate::model::Data;
 use crate::slog::log;
 use crate::window_size::WindowSize;
 use std::cell::RefCell;

src/channel/channel_exec.rs

@@ -1,7 +1,7 @@
 use super::channel::Channel;
 use crate::constant::{ssh_msg_code, ssh_str};
-use crate::data::Data;
 use crate::error::SshResult;
+use crate::model::Data;
 use std::io::{Read, Write};
 
 pub struct ChannelExec<S: Read + Write>(pub(crate) Channel<S>);

src/channel/channel_scp.rs

@@ -1,6 +1,6 @@
 use crate::constant::{scp, ssh_msg_code, ssh_str};
-use crate::data::Data;
 use crate::error::{SshError, SshResult};
+use crate::model::Data;
 use crate::Channel;
 use std::path::{Path, PathBuf};
 use std::{

src/channel/channel_shell.rs

@@ -1,7 +1,7 @@
 use super::channel::Channel;
 use crate::constant::{ssh_msg_code, ssh_str};
-use crate::data::Data;
 use crate::error::SshResult;
+use crate::model::Data;
 use std::io::{Read, Write};
 
 pub struct ChannelShell<S: Read + Write>(pub(crate) Channel<S>);

src/channel/mod.rs

@@ -1,3 +1,4 @@
+#[allow(clippy::module_inception)]
 pub mod channel;
 pub mod channel_exec;
 pub mod channel_scp;

src/client/client_r.rs

@@ -4,9 +4,8 @@ use crate::algorithm::{
 };
 use crate::client::Client;
 use crate::constant::{size, ssh_msg_code};
-use crate::data::Data;
 use crate::h::H;
-use crate::packet::Packet;
+use crate::model::{Data, Packet};
 use crate::window_size::WindowSize;
 use crate::{algorithm::hash, config::version::SshVersion};
 use crate::{algorithm::key_exchange::KeyExchange, config::algorithm::AlgList};

src/client/client_w.rs

@@ -1,5 +1,5 @@
-use crate::data::Data;
-use crate::packet::Packet;
+use crate::model::Data;
+use crate::model::Packet;
 use crate::window_size::WindowSize;
 use crate::{client::Client, config::version::SshVersion};
 use crate::{constant, h::H, kex, SshError, SshResult};

src/client/mod.rs

@@ -1,3 +1,4 @@
+#[allow(clippy::module_inception)]
 pub(crate) mod client;
 pub(crate) mod client_r;
 pub(crate) mod client_w;

src/config/algorithm.rs

@@ -1,7 +1,7 @@
 use crate::{
     constant::algorithms as constant,
-    data::Data,
     error::{SshError, SshResult},
+    model::Data,
     util,
 };
 

src/config/auth.rs

@@ -1,6 +1,6 @@
 use crate::algorithm::hash::HashType;
-use crate::data::Data;
 use crate::h::H;
+use crate::model::Data;
 use crate::{algorithm::hash, constant::algorithms};
 use crate::{SshError, SshResult};
 use rsa::pkcs1::DecodeRsaPrivateKey;

src/config/version.rs

@@ -2,9 +2,9 @@ use std::io::{Read, Write};
 
 use crate::{
     constant::CLIENT_VERSION,
-    data::Data,
     error::{SshError, SshResult},
     h::H,
+    model::Data,
 };
 
 type OurVer = String;

src/h.rs

@@ -1,4 +1,4 @@
-use crate::data::Data;
+use crate::model::Data;
 
 /// 密钥交换产生两个值：一个共享秘密 K，以及一个交换哈希 H。加密和验证密钥来自它们。第一
 /// 次密钥交换的交换哈希 H 也被用作会话标识，它是一个对该连接的唯一标识。它是验证方法中

src/kex.rs

@@ -7,8 +7,8 @@ use crate::algorithm::{
     public_key::{self, PublicKey},
 };
 use crate::constant::ssh_msg_code;
-use crate::data::Data;
 use crate::error::{SshError, SshResult};
+use crate::model::Data;
 use crate::slog::log;
 use crate::window_size::WindowSize;
 use crate::{algorithm::hash, config::algorithm::AlgList};

src/lib.rs

@@ -252,9 +252,8 @@ mod channel;
 mod client;
 mod config;
 mod constant;
-mod data;
 mod kex;
-mod packet;
+mod model;
 mod session;
 mod slog;
 mod timeout;

src/model/mod.rs

@@ -0,0 +1,5 @@
+pub(crate) mod data;
+pub(crate) mod packet;
+
+pub(crate) use data::Data;
+pub(crate) use packet::Packet;

src/packet.rs → src/model/packet.rs

@@ -1,5 +1,5 @@
 use crate::algorithm::encryption::Encryption;
-use crate::data::Data;
+use crate::model::Data;
 
 /// ## 数据包整体结构
 ///

src/session/mod.rs

@@ -1,3 +1,4 @@
+#[allow(clippy::module_inception)]
 pub mod session;
 mod session_auth;
 

src/session/session.rs

@@ -1,8 +1,8 @@
 use crate::client::Client;
 use crate::constant::{size, ssh_msg_code, ssh_str};
-use crate::data::Data;
 use crate::h::H;
 use crate::kex;
+use crate::model::Data;
 use crate::slog::log;
 use crate::window_size::WindowSize;
 use crate::{algorithm::hash::HashType, config::Config};

src/session/session_auth.rs

@@ -1,6 +1,6 @@
 use crate::constant::{ssh_msg_code, ssh_str};
-use crate::data::Data;
 use crate::h::H;
+use crate::model::Data;
 use crate::{algorithm::hash::HashType, config::auth::AuthInfo};
 use crate::{Session, SshResult};
 use std::io::{Read, Write};

src/window_size.rs

@@ -3,8 +3,8 @@ use std::io::{Read, Write};
 use crate::client::Client;
 use crate::constant::size::LOCAL_WINDOW_SIZE;
 use crate::constant::ssh_msg_code;
-use crate::data::Data;
 use crate::error::SshResult;
+use crate::model::Data;
 
 pub struct WindowSize {
     pub(crate) server_channel_no: u32,