From 89c4c4eae451bab22932700bb93ac406860373b8 Mon Sep 17 00:00:00 2001
From: Louis <louis@losynix.net>
Date: Mon, 18 Sep 2023 12:37:05 +0200
Subject: [PATCH] Use upstream rusb

Now that the disable_device_discovery patch has been merged
---
 Cargo.lock                     | 8 +++++---
 usbsas-hid/hid-user/Cargo.toml | 2 +-
 usbsas-mass-storage/Cargo.toml | 2 +-
 usbsas-scsi/Cargo.toml         | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 5f45880b..00e01370 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1584,7 +1584,8 @@ dependencies = [
 [[package]]
 name = "libusb1-sys"
 version = "0.6.4"
-source = "git+https://github.com/losynix/rusb?branch=disable_device_discovery#7b0703d71a425205ccc94d565e062dc612f13fd7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9d0e2afce4245f2c9a418511e5af8718bcaf2fa408aefb259504d1a9cb25f27"
 dependencies = [
  "cc",
  "libc",
@@ -2259,8 +2260,9 @@ dependencies = [
 
 [[package]]
 name = "rusb"
-version = "0.9.2"
-source = "git+https://github.com/losynix/rusb?branch=disable_device_discovery#7b0703d71a425205ccc94d565e062dc612f13fd7"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "45fff149b6033f25e825cbb7b2c625a11ee8e6dac09264d49beb125e39aa97bf"
 dependencies = [
  "libc",
  "libusb1-sys",
diff --git a/usbsas-hid/hid-user/Cargo.toml b/usbsas-hid/hid-user/Cargo.toml
index bd8db588..cba372e4 100644
--- a/usbsas-hid/hid-user/Cargo.toml
+++ b/usbsas-hid/hid-user/Cargo.toml
@@ -9,6 +9,6 @@ license = "GPL-3.0"
 bitfield = "0.14"
 env_logger = "0.10"
 log = "0.4"
-rusb = { git = "https://github.com/losynix/rusb", branch = "disable_device_discovery", features = ["vendored"] }
+rusb = { version = "0.9", features = ["vendored"] }
 usbsas-sandbox = { path = "../../usbsas-sandbox" }
 x11 = "2.21"
diff --git a/usbsas-mass-storage/Cargo.toml b/usbsas-mass-storage/Cargo.toml
index 86e984ca..5fd0b10f 100644
--- a/usbsas-mass-storage/Cargo.toml
+++ b/usbsas-mass-storage/Cargo.toml
@@ -8,7 +8,7 @@ license = "GPL-3.0"
 log = "0.4"
 lru = "0.11"
 positioned-io2 = "0.3"
-rusb = { git = "https://github.com/losynix/rusb", branch = "disable_device_discovery", features = ["vendored"] }
+rusb = { version = "0.9", features = ["vendored"] }
 thiserror = "1.0"
 usbsas-comm = { path = "../usbsas-comm" }
 usbsas-proto = { path = "../usbsas-proto" }
diff --git a/usbsas-scsi/Cargo.toml b/usbsas-scsi/Cargo.toml
index d873e95c..63debb36 100644
--- a/usbsas-scsi/Cargo.toml
+++ b/usbsas-scsi/Cargo.toml
@@ -7,4 +7,4 @@ license = "GPL-3.0"
 [dependencies]
 byteorder = "1.4"
 log = "0.4"
-rusb = { git = "https://github.com/losynix/rusb", branch = "disable_device_discovery", features = ["vendored"] }
+rusb = { version = "0.9", features = ["vendored"] }