upgrade to tokio 1.36

This commit is contained in:
rustdesk 2024-02-14 12:18:49 +08:00
parent 3f7244f23f
commit 72fc34cd40
3 changed files with 27 additions and 17 deletions

34
Cargo.lock generated
View File

@ -3718,7 +3718,7 @@ dependencies = [
[[package]] [[package]]
name = "magnum-opus" name = "magnum-opus"
version = "0.4.0" version = "0.4.0"
source = "git+https://github.com/rustdesk/magnum-opus#5cd2bf989c148662fa3a2d9d539a71d71fd1d256" source = "git+https://github.com/rustdesk-org/magnum-opus#5cd2bf989c148662fa3a2d9d539a71d71fd1d256"
dependencies = [ dependencies = [
"bindgen 0.59.2", "bindgen 0.59.2",
"pkg-config", "pkg-config",
@ -3815,11 +3815,11 @@ dependencies = [
[[package]] [[package]]
name = "miow" name = "miow"
version = "0.5.0" version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "52ffbca2f655e33c08be35d87278e5b18b89550a37dbd598c20db92f6a471123" checksum = "359f76430b20a79f9e20e115b3428614e654f04fab314482fc0fda0ebd3c6044"
dependencies = [ dependencies = [
"windows-sys 0.42.0", "windows-sys 0.48.0",
] ]
[[package]] [[package]]
@ -4456,8 +4456,8 @@ dependencies = [
[[package]] [[package]]
name = "parity-tokio-ipc" name = "parity-tokio-ipc"
version = "0.7.3-2" version = "0.7.3-3"
source = "git+https://github.com/open-trade/parity-tokio-ipc#a5b7861249107cbacc856cd43507cb95f40aef6e" source = "git+https://github.com/rustdesk-org/parity-tokio-ipc#f2d1fcf8fb002335d9a62bec308559d40698694d"
dependencies = [ dependencies = [
"futures", "futures",
"libc", "libc",
@ -5957,6 +5957,16 @@ dependencies = [
"winapi 0.3.9", "winapi 0.3.9",
] ]
[[package]]
name = "socket2"
version = "0.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7b5fac59a5cb5dd637972e5fca70daf0523c9067fcdc4842f053dae04a18f8e9"
dependencies = [
"libc",
"windows-sys 0.48.0",
]
[[package]] [[package]]
name = "sodiumoxide" name = "sodiumoxide"
version = "0.2.7" version = "0.2.7"
@ -6419,11 +6429,11 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]] [[package]]
name = "tokio" name = "tokio"
version = "1.28.1" version = "1.36.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105" checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931"
dependencies = [ dependencies = [
"autocfg 1.1.0", "backtrace",
"bytes", "bytes",
"libc", "libc",
"mio", "mio",
@ -6431,16 +6441,16 @@ dependencies = [
"parking_lot", "parking_lot",
"pin-project-lite", "pin-project-lite",
"signal-hook-registry", "signal-hook-registry",
"socket2 0.4.10", "socket2 0.5.5",
"tokio-macros", "tokio-macros",
"windows-sys 0.48.0", "windows-sys 0.48.0",
] ]
[[package]] [[package]]
name = "tokio-macros" name = "tokio-macros"
version = "2.1.0" version = "2.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
dependencies = [ dependencies = [
"proc-macro2 1.0.69", "proc-macro2 1.0.69",
"quote 1.0.33", "quote 1.0.33",

View File

@ -56,9 +56,9 @@ cfg-if = "1.0"
lazy_static = "1.4" lazy_static = "1.4"
sha2 = "0.10" sha2 = "0.10"
repng = "0.2" repng = "0.2"
parity-tokio-ipc = { git = "https://github.com/open-trade/parity-tokio-ipc" } parity-tokio-ipc = { git = "https://github.com/rustdesk-org/parity-tokio-ipc" }
runas = "=1.0" # https://github.com/mitsuhiko/rust-runas/issues/13 runas = "=1.0" # https://github.com/mitsuhiko/rust-runas/issues/13
magnum-opus = { git = "https://github.com/rustdesk/magnum-opus" } magnum-opus = { git = "https://github.com/rustdesk-org/magnum-opus" }
dasp = { version = "0.11", features = ["signal", "interpolate-linear", "interpolate"], optional = true } dasp = { version = "0.11", features = ["signal", "interpolate-linear", "interpolate"], optional = true }
rubato = { version = "0.12", optional = true } rubato = { version = "0.12", optional = true }
samplerate = { version = "0.2", optional = true } samplerate = { version = "0.2", optional = true }

View File

@ -8,8 +8,8 @@ edition = "2018"
[dependencies] [dependencies]
flexi_logger = { version = "0.27", features = ["async"] } flexi_logger = { version = "0.27", features = ["async"] }
protobuf = { version = "3.2", features = ["with-bytes"] } protobuf = { version = "3.3", features = ["with-bytes"] }
tokio = { version = "=1.28.1", features = ["full"] } tokio = { version = "1.36", features = ["full"] }
tokio-util = { version = "0.7", features = ["full"] } tokio-util = { version = "0.7", features = ["full"] }
futures = "0.3" futures = "0.3"
bytes = { version = "1.4", features = ["serde"] } bytes = { version = "1.4", features = ["serde"] }
@ -50,7 +50,7 @@ quic = []
flatpak = [] flatpak = []
[build-dependencies] [build-dependencies]
protobuf-codegen = { version = "3.2" } protobuf-codegen = { version = "3.3" }
[target.'cfg(target_os = "windows")'.dependencies] [target.'cfg(target_os = "windows")'.dependencies]
winapi = { version = "0.3", features = ["winuser", "synchapi", "pdh", "memoryapi"] } winapi = { version = "0.3", features = ["winuser", "synchapi", "pdh", "memoryapi"] }