From f40bf2c528ac367f99261a87287738f40df085c6 Mon Sep 17 00:00:00 2001
From: John Whittington <git@jbrengineering.co.uk>
Date: Tue, 21 Nov 2023 12:38:02 +0100
Subject: [PATCH] allow empty CROSS_DEB_ARCH

---
 Cargo.toml   |  3 +++
 src/lsusb.rs |  2 +-
 src/udev.rs  | 10 +++++-----
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index 541e579..540a609 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -69,5 +69,8 @@ codegen-units = 1 # quicker binary, slower build
 [package.metadata.cross.build]
 pre-build = ["dpkg --add-architecture $CROSS_DEB_ARCH && apt-get update && apt-get install --assume-yes libusb-1.0-0-dev:$CROSS_DEB_ARCH libudev-dev:$CROSS_DEB_ARCH"]
 
+[package.metadata.cross.target.x86_64-unknown-linux-gnu]
+pre-build = ["apt-get update && apt-get install --assume-yes libusb-1.0-0-dev libudev-dev"]
+
 [package.metadata.deb]
 section = "utility"
diff --git a/src/lsusb.rs b/src/lsusb.rs
index 332e87a..c4b5381 100644
--- a/src/lsusb.rs
+++ b/src/lsusb.rs
@@ -833,7 +833,7 @@ pub mod names {
     #[allow(unused_variables)]
     fn hwdb_get(modalias: &str, key: &'static str) -> Result<Option<String>, Error> {
         #[cfg(all(target_os = "linux", feature = "udev_hwdb"))]
-        return crate::udev::hwdb::hwdb_get(modalias, key);
+        return crate::udev::hwdb::get(modalias, key);
 
         #[cfg(not(all(target_os = "linux", feature = "udev_hwdb")))]
         return Err(Error::new(
diff --git a/src/udev.rs b/src/udev.rs
index 02c5b95..7a97848 100644
--- a/src/udev.rs
+++ b/src/udev.rs
@@ -140,19 +140,19 @@ pub mod hwdb {
     /// Should act like https://github.com/gregkh/usbutils/blob/master/names.c#L115
     ///
     /// ```
-    /// use cyme::udev::hwdb_get;
+    /// use cyme::udev;
     ///
     /// let modalias = "usb:v1D6Bp0001";
-    /// let vendor = hwdb_get(&modalias, "ID_VENDOR_FROM_DATABASE").unwrap();
+    /// let vendor = hwdb::get(&modalias, "ID_VENDOR_FROM_DATABASE").unwrap();
     ///
     /// assert_eq!(vendor, Some("Linux Foundation".into()));
     ///
     /// let modalias = "usb:v*p*d*dc03dsc01dp01*";
-    /// let vendor = hwdb_get(&modalias, "ID_USB_PROTOCOL_FROM_DATABASE").unwrap();
+    /// let vendor = hwdb::get(&modalias, "ID_USB_PROTOCOL_FROM_DATABASE").unwrap();
     ///
     /// assert_eq!(vendor, Some("Keyboard".into()));
     /// ```
-    pub fn hwdb_get(modalias: &str, key: &'static str) -> Result<Option<String>, Error> {
+    pub fn get(modalias: &str, key: &'static str) -> Result<Option<String>, Error> {
         let hwdb = udevlib::Hwdb::new().map_err(|e| {
             Error::new(
                 ErrorKind::Udev,
@@ -180,7 +180,7 @@ mod tests {
     }
 
     /// Tests can lookup bInterfaceClass of the root hub, which is always 09
-    #[cfg_attr(not(feature = "usb_test", feature = "udev_hwdb"), ignore)]
+    #[cfg_attr(not(feature = "usb_test"), ignore)]
     #[test]
     fn test_udev_attribute() {
         let interface_class = get_udev_attribute("1-0:1.0", "bInterfaceClass").unwrap();