luckyimnotanigger/tun2proxy
1
0
Fork 0
mirror of https://github.com/tun2proxy/tun2proxy.git synced 2025-06-20 16:10:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

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
Download patch file Download diff file Expand all files Collapse all files

14
src/error.rs
View file

@ -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>;