From c94db606e557a6650249496f4177d91ac5098a52 Mon Sep 17 00:00:00 2001 From: MystiPanda Date: Wed, 10 Jan 2024 19:24:14 +0800 Subject: [PATCH] build: Use old sysproxy --- src-tauri/Cargo.lock | 52 ++++---------------------------------------- src-tauri/Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 49 deletions(-) diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index cbb8f93..d84fa14 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -28,19 +28,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "ahash" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a" -dependencies = [ - "cfg-if", - "getrandom 0.2.11", - "once_cell", - "version_check", - "zerocopy", -] - [[package]] name = "aho-corasick" version = "0.6.10" @@ -1828,7 +1815,7 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash 0.7.7", + "ahash", ] [[package]] @@ -2182,17 +2169,6 @@ version = "2.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3" -[[package]] -name = "iptools" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c03bfb870879ce6a141b644653d63b203d290ec5f3b6919cf7b30cba06a164a5" -dependencies = [ - "ahash 0.8.6", - "once_cell", - "regex 1.10.2", -] - [[package]] name = "is-docker" version = "0.2.0" @@ -4492,12 +4468,12 @@ dependencies = [ [[package]] name = "sysproxy" version = "0.3.0" -source = "git+https://github.com/zzzgydi/sysproxy-rs?branch=main#f8fab6a542c41cf3b973f4fe77d399756e3efff1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9707a79d3b95683aa5a9521e698ffd878b8fb289727c25a69157fb85d529ffff" dependencies = [ "interfaces", - "iptools", "thiserror", - "windows 0.52.0", + "winapi", "winreg 0.10.1", ] @@ -6342,26 +6318,6 @@ dependencies = [ "zvariant", ] -[[package]] -name = "zerocopy" -version = "0.7.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d6f15f7ade05d2a4935e34a457b936c23dc70a05cc1d97133dc99e7a3fe0f0e" -dependencies = [ - "zerocopy-derive", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbbad221e3f78500350ecbd7dfa4e63ef945c05f4c61cb7f4d3f84cd0bba649b" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.39", -] - [[package]] name = "zip" version = "0.6.6" diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index a06649f..d87016f 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -14,6 +14,7 @@ tauri-build = { version = "1", features = [] } [dependencies] warp = "0.3" +sysproxy = "0.3.0" which = "5.0.0" anyhow = "1.0" dirs = "5.0" @@ -38,7 +39,6 @@ window-shadows = { version = "0.2" } tokio = { version = "1", features = ["full"] } serde = { version = "1.0", features = ["derive"] } reqwest = { version = "0.11", features = ["json", "rustls-tls"] } -sysproxy = { git="https://github.com/zzzgydi/sysproxy-rs", branch = "main" } tauri = { version = "1.5", features = [ "notification-all", "icon-png", "clipboard-all", "global-shortcut-all", "process-all", "shell-all", "system-tray", "updater", "window-all"] } [target.'cfg(windows)'.dependencies]