summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorDavid Lönnhager <david.l@mullvad.net>2023-03-13 17:12:33 +0100
committerDavid Lönnhager <david.l@mullvad.net>2023-03-14 11:10:22 +0100
commit14da32895279169b479cf0311e7261bda377794f (patch)
tree3f6bdb3289d770237d17860347a81b58085e506a
parent74a5414358a80429a3e64a7f4b2cd9f7cf523411 (diff)
downloadmullvadvpn-14da32895279169b479cf0311e7261bda377794f.tar.xz
mullvadvpn-14da32895279169b479cf0311e7261bda377794f.zip
Update parking_lot
-rw-r--r--Cargo.lock112
-rw-r--r--mullvad-daemon/Cargo.toml2
-rw-r--r--mullvad-relay-selector/Cargo.toml2
-rw-r--r--talpid-core/Cargo.toml2
-rw-r--r--talpid-openvpn/Cargo.toml2
-rw-r--r--talpid-wireguard/Cargo.toml2
6 files changed, 27 insertions, 95 deletions
diff --git a/Cargo.lock b/Cargo.lock
index 6e5a7cfffd..87bef3c513 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1401,7 +1401,7 @@ dependencies = [
"jni",
"jnix-macros",
"once_cell",
- "parking_lot 0.12.1",
+ "parking_lot",
]
[[package]]
@@ -1709,7 +1709,7 @@ dependencies = [
"mullvad-version",
"nix 0.23.1",
"objc",
- "parking_lot 0.11.2",
+ "parking_lot",
"rand 0.8.5",
"regex",
"serde",
@@ -1838,7 +1838,7 @@ dependencies = [
"log",
"mullvad-api",
"mullvad-types",
- "parking_lot 0.11.2",
+ "parking_lot",
"rand 0.8.5",
"serde",
"serde_json",
@@ -2154,50 +2154,25 @@ dependencies = [
[[package]]
name = "parking_lot"
-version = "0.11.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
-dependencies = [
- "instant",
- "lock_api",
- "parking_lot_core 0.8.5",
-]
-
-[[package]]
-name = "parking_lot"
version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
dependencies = [
"lock_api",
- "parking_lot_core 0.9.3",
+ "parking_lot_core",
]
[[package]]
name = "parking_lot_core"
-version = "0.8.5"
+version = "0.9.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216"
+checksum = "9069cbb9f99e3a5083476ccb29ceb1de18b9118cafa53e90c9551235de2b9521"
dependencies = [
"cfg-if",
- "instant",
"libc",
"redox_syscall",
"smallvec",
- "winapi",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929"
-dependencies = [
- "cfg-if",
- "libc",
- "redox_syscall",
- "smallvec",
- "windows-sys 0.36.1",
+ "windows-sys 0.45.0",
]
[[package]]
@@ -3202,7 +3177,7 @@ dependencies = [
"once_cell",
"os_pipe",
"parity-tokio-ipc",
- "parking_lot 0.11.2",
+ "parking_lot",
"pfctl",
"prost",
"quickcheck",
@@ -3269,7 +3244,7 @@ dependencies = [
"log",
"os_pipe",
"parity-tokio-ipc",
- "parking_lot 0.11.2",
+ "parking_lot",
"prost",
"shadowsocks-service",
"shell-escape",
@@ -3432,7 +3407,7 @@ dependencies = [
"netlink-packet-utils",
"netlink-proto",
"nix 0.23.1",
- "parking_lot 0.11.2",
+ "parking_lot",
"rand 0.8.5",
"rtnetlink",
"socket2",
@@ -3544,7 +3519,7 @@ dependencies = [
"memchr",
"mio",
"num_cpus",
- "parking_lot 0.12.1",
+ "parking_lot",
"pin-project-lite",
"signal-hook-registry",
"socket2",
@@ -3849,7 +3824,7 @@ dependencies = [
"ipconfig",
"lazy_static",
"lru-cache",
- "parking_lot 0.12.1",
+ "parking_lot",
"resolv-conf",
"serde",
"smallvec",
@@ -4186,30 +4161,17 @@ dependencies = [
[[package]]
name = "windows-sys"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
-dependencies = [
- "windows_aarch64_msvc 0.36.1",
- "windows_i686_gnu 0.36.1",
- "windows_i686_msvc 0.36.1",
- "windows_x86_64_gnu 0.36.1",
- "windows_x86_64_msvc 0.36.1",
-]
-
-[[package]]
-name = "windows-sys"
version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
dependencies = [
"windows_aarch64_gnullvm",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
"windows_x86_64_gnullvm",
- "windows_x86_64_msvc 0.42.2",
+ "windows_x86_64_msvc",
]
[[package]]
@@ -4228,12 +4190,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
dependencies = [
"windows_aarch64_gnullvm",
- "windows_aarch64_msvc 0.42.2",
- "windows_i686_gnu 0.42.2",
- "windows_i686_msvc 0.42.2",
- "windows_x86_64_gnu 0.42.2",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
"windows_x86_64_gnullvm",
- "windows_x86_64_msvc 0.42.2",
+ "windows_x86_64_msvc",
]
[[package]]
@@ -4244,48 +4206,24 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
[[package]]
name = "windows_aarch64_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
-
-[[package]]
-name = "windows_aarch64_msvc"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
[[package]]
name = "windows_i686_gnu"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
-
-[[package]]
-name = "windows_i686_gnu"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
[[package]]
name = "windows_i686_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
-
-[[package]]
-name = "windows_i686_msvc"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
[[package]]
name = "windows_x86_64_gnu"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
-
-[[package]]
-name = "windows_x86_64_gnu"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
@@ -4298,12 +4236,6 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
[[package]]
name = "windows_x86_64_msvc"
-version = "0.36.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
-
-[[package]]
-name = "windows_x86_64_msvc"
version = "0.42.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
diff --git a/mullvad-daemon/Cargo.toml b/mullvad-daemon/Cargo.toml
index 33aa358020..d427ac84f3 100644
--- a/mullvad-daemon/Cargo.toml
+++ b/mullvad-daemon/Cargo.toml
@@ -17,7 +17,7 @@ ipnetwork = "0.16"
lazy_static = "1.0"
libc = "0.2"
log = "0.4"
-parking_lot = "0.11"
+parking_lot = "0.12.0"
rand = "0.8.5"
regex = "1.0"
serde = { version = "1.0", features = ["derive"] }
diff --git a/mullvad-relay-selector/Cargo.toml b/mullvad-relay-selector/Cargo.toml
index 9a18fa1618..18718d16dc 100644
--- a/mullvad-relay-selector/Cargo.toml
+++ b/mullvad-relay-selector/Cargo.toml
@@ -13,7 +13,7 @@ err-derive = "0.3.1"
futures = "0.3"
ipnetwork = "0.16"
log = "0.4"
-parking_lot = "0.11"
+parking_lot = "0.12.0"
rand = "0.8.5"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
diff --git a/talpid-core/Cargo.toml b/talpid-core/Cargo.toml
index a99dd34201..d1bcf36db7 100644
--- a/talpid-core/Cargo.toml
+++ b/talpid-core/Cargo.toml
@@ -21,7 +21,7 @@ once_cell = "1.13"
libc = "0.2"
log = "0.4"
os_pipe = "0.9"
-parking_lot = "0.11"
+parking_lot = "0.12.0"
regex = "1.1.0"
talpid-routing = { path = "../talpid-routing" }
talpid-types = { path = "../talpid-types" }
diff --git a/talpid-openvpn/Cargo.toml b/talpid-openvpn/Cargo.toml
index 7a0dcabbde..36c6581e07 100644
--- a/talpid-openvpn/Cargo.toml
+++ b/talpid-openvpn/Cargo.toml
@@ -19,7 +19,7 @@ is-terminal = "0.4.2"
lazy_static = "1.0"
log = "0.4"
os_pipe = "0.9"
-parking_lot = "0.11"
+parking_lot = "0.12.0"
shell-escape = "0.1"
talpid-routing = { path = "../talpid-routing" }
talpid-tunnel = { path = "../talpid-tunnel" }
diff --git a/talpid-wireguard/Cargo.toml b/talpid-wireguard/Cargo.toml
index d2fce62d93..0d13792190 100644
--- a/talpid-wireguard/Cargo.toml
+++ b/talpid-wireguard/Cargo.toml
@@ -16,7 +16,7 @@ ipnetwork = "0.16"
lazy_static = "1.0"
libc = "0.2"
log = "0.4"
-parking_lot = "0.11"
+parking_lot = "0.12.0"
talpid-routing = { path = "../talpid-routing" }
talpid-types = { path = "../talpid-types" }
talpid-tunnel-config-client = { path = "../talpid-tunnel-config-client" }