From ab9f8011f047443d0f6df1342abfaa5ccc7e401e Mon Sep 17 00:00:00 2001
From: ssrlive <30760636+ssrlive@users.noreply.github.com>
Date: Fri, 21 Jul 2023 14:42:55 +0800
Subject: [PATCH] Update dependencies

---
 Cargo.toml   | 14 +++++++-------
 src/error.rs | 14 +++++---------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 6ebe9c2..cedd349 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,12 +9,14 @@ crate-type = ["cdylib", "lib"]
 
 [dependencies]
 base64 = { version = "0.21" }
-clap = { version = "4.1", features = ["derive"] }
-ctrlc = "3.2"
+clap = { version = "4.3", features = ["derive"] }
+ctrlc = "3.4"
+digest_auth = "0.3.1"
 dotenvy = "0.15"
 env_logger = "0.10"
 fork = "0.1"
 hashlink = "0.8"
+httparse = "1.8.0"
 libc = "0.2"
 log = "0.4"
 mio = { version = "0.8", features = ["os-poll", "net", "os-ext"] }
@@ -22,17 +24,15 @@ nix = { version = "0.26", features = ["process", "signal"] }
 prctl = "1.0"
 smoltcp = { version = "0.10.0", features = ["std", "phy-tuntap_interface"] }
 thiserror = "1.0"
-url = "2.3"
-digest_auth = "0.3.1"
-httparse = "1.8.0"
 unicase = "2.6.0"
+url = "2.4"
 
 [target.'cfg(target_os="android")'.dependencies]
 android_logger = "0.13"
 jni = { version = "0.21", default-features = false }
 
 [dev-dependencies]
-ctor = "0.1"
+ctor = "0.2"
 reqwest = { version = "0.11", default-features = false, features = ["blocking", "json", "rustls-tls"] }
-serial_test = "1.0"
+serial_test = "2.0"
 test-log = "0.2"
diff --git a/src/error.rs b/src/error.rs
index dbfe962..86596f4 100644
--- a/src/error.rs
+++ b/src/error.rs
@@ -34,15 +34,9 @@ pub enum Error {
     #[error("jni::errors::Error {0:?}")]
     Jni(#[from] jni::errors::Error),
 
-    #[error("&str {0}")]
-    Str(String),
-
-    #[error("String {0}")]
+    #[error("{0}")]
     String(String),
 
-    #[error("&String {0}")]
-    RefString(String),
-
     #[error("nix::errno::Errno {0:?}")]
     OSError(#[from] nix::errno::Errno),
 
@@ -58,7 +52,7 @@ pub enum Error {
 
 impl From<&str> for Error {
     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 {
     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>;