From bf95377e9a56697d8b6c50b9b519a42e72c0d57b Mon Sep 17 00:00:00 2001
From: chaos <chaoticryptidz@owo.monster>
Date: Wed, 27 Sep 2023 21:24:20 +0100
Subject: [PATCH] chore(deps): lock file maintenance

---
 Cargo.lock | 55 ++++++++++++------------------------------------------
 1 file changed, 12 insertions(+), 43 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 9ba848e..caa142c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -522,19 +522,6 @@ dependencies = [
 ]
 
 [[package]]
-<<<<<<< HEAD
-=======
-name = "crossbeam-channel"
-version = "0.5.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
-dependencies = [
- "cfg-if",
- "crossbeam-utils",
-]
-
-[[package]]
->>>>>>> 88cd1e9 (fix(deps): update rust crate ravif to 0.11.3)
 name = "crossbeam-deque"
 version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -634,7 +621,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
-<<<<<<< HEAD
 name = "errno"
 version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -656,8 +642,6 @@ dependencies = [
 ]
 
 [[package]]
-=======
->>>>>>> 88cd1e9 (fix(deps): update rust crate ravif to 0.11.3)
 name = "exr"
 version = "1.71.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1098,6 +1082,12 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d4345964bb142484797b161f473a503a434de77149dd8c7427788c6e13379388"
 
+[[package]]
+name = "lazy_static"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+
 [[package]]
 name = "lebe"
 version = "0.5.2"
@@ -1141,15 +1131,12 @@ dependencies = [
 ]
 
 [[package]]
-<<<<<<< HEAD
 name = "linux-raw-sys"
 version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128"
 
 [[package]]
-=======
->>>>>>> 88cd1e9 (fix(deps): update rust crate ravif to 0.11.3)
 name = "local-channel"
 version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1257,18 +1244,6 @@ dependencies = [
  "log",
  "wasi",
  "windows-sys",
-<<<<<<< HEAD
-=======
-]
-
-[[package]]
-name = "nanorand"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3"
-dependencies = [
- "getrandom",
->>>>>>> 88cd1e9 (fix(deps): update rust crate ravif to 0.11.3)
 ]
 
 [[package]]
@@ -1410,7 +1385,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
 
 [[package]]
-<<<<<<< HEAD
 name = "openssl"
 version = "0.10.57"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1455,8 +1429,6 @@ dependencies = [
 ]
 
 [[package]]
-=======
->>>>>>> 88cd1e9 (fix(deps): update rust crate ravif to 0.11.3)
 name = "parking_lot"
 version = "0.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1836,7 +1808,6 @@ dependencies = [
 ]
 
 [[package]]
-<<<<<<< HEAD
 name = "rustix"
 version = "0.38.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1850,8 +1821,6 @@ dependencies = [
 ]
 
 [[package]]
-=======
->>>>>>> 88cd1e9 (fix(deps): update rust crate ravif to 0.11.3)
 name = "rustls"
 version = "0.21.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1889,7 +1858,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
 
 [[package]]
-<<<<<<< HEAD
 name = "schannel"
 version = "0.1.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1899,8 +1867,6 @@ dependencies = [
 ]
 
 [[package]]
-=======
->>>>>>> 88cd1e9 (fix(deps): update rust crate ravif to 0.11.3)
 name = "scopeguard"
 version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2127,7 +2093,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9d0e916b1148c8e263850e1ebcbd046f333e0683c724876bb0da63ea4373dc8a"
 
 [[package]]
-<<<<<<< HEAD
 name = "tempfile"
 version = "3.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2141,8 +2106,6 @@ dependencies = [
 ]
 
 [[package]]
-=======
->>>>>>> 88cd1e9 (fix(deps): update rust crate ravif to 0.11.3)
 name = "thiserror"
 version = "1.0.49"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2425,6 +2388,12 @@ dependencies = [
  "rust_hawktracer",
 ]
 
+[[package]]
+name = "vcpkg"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
+
 [[package]]
 name = "version-compare"
 version = "0.1.1"