bump version to 0.8.0

dizda · May 7, 2022 · fa02cea · fa02cea
1 parent ed3bf61
commit fa02cea
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "fast-socks5"
-version = "0.7.0"
+version = "0.8.0"
 authors = ["Jonathan Dizdarevic <[email protected]>"]
 edition = "2018"
 license = "MIT"

diff --git a/examples/simple_tcp_server.rs b/examples/simple_tcp_server.rs
@@ -18,10 +18,10 @@ use tokio::{
 /// # How to use it:
 ///
 /// Listen on a local address, authentication-free:
-///     `$ RUST_LOG=debug cargo run --example server -- --listen-addr 127.0.0.1:1337 no-auth`
+///     `$ RUST_LOG=debug cargo run --example simple_tcp_server -- --listen-addr 127.0.0.1:1337 no-auth`
 ///
 /// Listen on a local address, with basic username/password requirement:
-///     `$ RUST_LOG=debug cargo run --example server -- --listen-addr 127.0.0.1:1337 password --username admin --password password`
+///     `$ RUST_LOG=debug cargo run --example simple_tcp_server -- --listen-addr 127.0.0.1:1337 password --username admin --password password`
 ///
 #[derive(Debug, StructOpt)]
 #[structopt(

diff --git a/src/lib.rs b/src/lib.rs
@@ -6,8 +6,6 @@ pub mod client;
 pub mod server;
 pub mod util;
 
-#[cfg(feature = "socks4")]
-pub mod client4;
 #[cfg(feature = "socks4")]
 pub mod socks4;
 
@@ -154,7 +152,7 @@ pub enum SocksError {
 
     #[cfg(feature = "socks4")]
     #[error("Error with reply: {0}.")]
-    ReplySocks4Error(#[from] socks4::ReplyError),
+    ReplySocks4Error(#[from] socks3::ReplyError),
 
     #[error("Argument input error: `{0}`.")]
     ArgumentInputError(&'static str),
@@ -423,7 +421,7 @@ mod test {
             #[rustfmt::skip]
             tunnel.send_to(
                 &decode_hex(&(
-                    "AAAA".to_owned()   // ID 
+                    "AAAA".to_owned()   // ID
                     + "0100"            // Query parameters
                     + "0001"            // Number of questions
                     + "0000"            // Number of answers

diff --git a/src/client4.rs → src/socks4/client.rs b/src/client4.rs → src/socks4/client.rs
@@ -1,6 +1,6 @@
 #[forbid(unsafe_code)]
 use crate::read_exact;
-use crate::socks4::{consts, ReplyError, Socks4Command};
+use crate::socks3::{consts, ReplyError, Socks4Command};
 use crate::util::target_addr::{TargetAddr, ToTargetAddr};
 use crate::{Result, SocksError, SocksError::ReplySocks4Error};
 use anyhow::Context;

diff --git a/src/socks4.rs → src/socks4/mod.rs b/src/socks4.rs → src/socks4/mod.rs
@@ -1,3 +1,5 @@
+pub mod client;
+
 use thiserror::Error;
 
 #[rustfmt::skip]
@@ -83,4 +85,4 @@ impl ReplyError {
             _                                      => ReplyError::UnknownResponse(code),
         }
     }
-}
+}