luckyimnotanigger/tun2proxy
1
0
Fork 0
mirror of https://github.com/tun2proxy/tun2proxy.git synced 2025-04-29 18:18:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Update dependencies

Browse source
This commit is contained in:
ssrlive 2023-07-21 14:42:55 +08:00 • committed by B. Blechschmidt
parent 3e26675919
commit ab9f8011f0
2 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Cargo.toml
View file

@ -9,12 +9,14 @@ crate-type = ["cdylib", "lib"]
[dependencies] [dependencies]
base64 = { version = "0.21" } base64 = { version = "0.21" }
clap = { version = "4.1", features = ["derive"] } clap = { version = "4.3", features = ["derive"] }
ctrlc = "3.2" ctrlc = "3.4"
digest_auth = "0.3.1"
dotenvy = "0.15" dotenvy = "0.15"
env_logger = "0.10" env_logger = "0.10"
fork = "0.1" fork = "0.1"
hashlink = "0.8" hashlink = "0.8"
httparse = "1.8.0"
libc = "0.2" libc = "0.2"
log = "0.4" log = "0.4"
mio = { version = "0.8", features = ["os-poll", "net", "os-ext"] } mio = { version = "0.8", features = ["os-poll", "net", "os-ext"] }
@ -22,17 +24,15 @@ nix = { version = "0.26", features = ["process", "signal"] }
prctl = "1.0" prctl = "1.0"
smoltcp = { version = "0.10.0", features = ["std", "phy-tuntap_interface"] } smoltcp = { version = "0.10.0", features = ["std", "phy-tuntap_interface"] }
thiserror = "1.0" thiserror = "1.0"
url = "2.3"
digest_auth = "0.3.1"
httparse = "1.8.0"
unicase = "2.6.0" unicase = "2.6.0"
url = "2.4"
[target.'cfg(target_os="android")'.dependencies] [target.'cfg(target_os="android")'.dependencies]
android_logger = "0.13" android_logger = "0.13"
jni = { version = "0.21", default-features = false } jni = { version = "0.21", default-features = false }
[dev-dependencies] [dev-dependencies]
ctor = "0.1" ctor = "0.2"
reqwest = { version = "0.11", default-features = false, features = ["blocking", "json", "rustls-tls"] } reqwest = { version = "0.11", default-features = false, features = ["blocking", "json", "rustls-tls"] }
serial_test = "1.0" serial_test = "2.0"
test-log = "0.2" test-log = "0.2"

14
src/error.rs
View file

@ -34,15 +34,9 @@ pub enum Error {
#[error("jni::errors::Error {0:?}")] #[error("jni::errors::Error {0:?}")]
Jni(#[from] jni::errors::Error), Jni(#[from] jni::errors::Error),
#[error("&str {0}")] #[error("{0}")]
Str(String),
#[error("String {0}")]
String(String), String(String),
#[error("&String {0}")]
RefString(String),
#[error("nix::errno::Errno {0:?}")] #[error("nix::errno::Errno {0:?}")]
OSError(#[from] nix::errno::Errno), OSError(#[from] nix::errno::Errno),
@ -58,7 +52,7 @@ pub enum Error {
impl From<&str> for Error { impl From<&str> for Error {
fn from(err: &str) -> Self { fn from(err: &str) -> Self {
Self::Str(err.to_string()) Self::String(err.to_string())
} }
} }
@ -70,6 +64,8 @@ impl From<String> for Error {
impl From<&String> for Error { impl From<&String> for Error {
fn from(err: &String) -> Self { fn from(err: &String) -> Self {
Self::RefString(err.to_string()) Self::String(err.to_string())
} }
} }
pub type Result<T, E = Error> = std::result::Result<T, E>;