From e2b970d8177fcc3602b4cdc061e0e470a1046039 Mon Sep 17 00:00:00 2001 From: G2-Games Date: Wed, 31 Jan 2024 13:09:37 -0600 Subject: [PATCH] Ran `cargo fmt` --- src/backend/native.rs | 24 +++++++++++++------- src/backend/wasm.rs | 52 +++++++++++++++++++++---------------------- src/usb.rs | 4 ++-- 3 files changed, 44 insertions(+), 36 deletions(-) diff --git a/src/backend/native.rs b/src/backend/native.rs index 13460a5..9dbcbe3 100644 --- a/src/backend/native.rs +++ b/src/backend/native.rs @@ -1,5 +1,5 @@ -use std::error::Error; use nusb; +use std::error::Error; use crate::usb::{ControlIn, ControlOut, ControlType, Device, Interface, Recipient}; @@ -32,7 +32,7 @@ pub async fn get_device(vendor_id: u16, product_id: u16) -> Result Result<(), Box> { match self.device.reset() { Ok(_) => Ok(()), - Err(e) => Err(e.into()) + Err(e) => Err(e.into()), } } @@ -89,20 +89,29 @@ impl<'a> Interface<'a> for UsbInterface { async fn control_out(&self, data: ControlOut<'a>) -> Result<(), Box> { match self.interface.control_out(data.into()).await.into_result() { Ok(_) => Ok(()), - Err(e) => Err(e.into()) + Err(e) => Err(e.into()), } } async fn bulk_in(&self, endpoint: u8, length: usize) -> Result, Box> { let request_buffer = nusb::transfer::RequestBuffer::new(length); - Ok(self.interface.bulk_in(endpoint, request_buffer).await.into_result()?) + Ok(self + .interface + .bulk_in(endpoint, request_buffer) + .await + .into_result()?) } async fn bulk_out(&self, endpoint: u8, data: &[u8]) -> Result> { - match self.interface.bulk_out(endpoint, data.to_vec()).await.into_result() { + match self + .interface + .bulk_out(endpoint, data.to_vec()) + .await + .into_result() + { Ok(len) => Ok(len.actual_length()), - Err(e) => Err(e.into()) + Err(e) => Err(e.into()), } } } @@ -146,7 +155,6 @@ impl From for nusb::transfer::ControlType { impl From for nusb::transfer::Recipient { fn from(val: Recipient) -> Self { match val { - Recipient::Device => nusb::transfer::Recipient::Device, Recipient::Interface => nusb::transfer::Recipient::Interface, Recipient::Endpoint => nusb::transfer::Recipient::Endpoint, diff --git a/src/backend/wasm.rs b/src/backend/wasm.rs index d66a01f..d984579 100644 --- a/src/backend/wasm.rs +++ b/src/backend/wasm.rs @@ -2,20 +2,13 @@ use std::error::Error; use wasm_bindgen::prelude::*; -use web_sys::{ - console, - Usb, - UsbDevice as WasmUsbDevice, - UsbInterface as WasmUsbInterface, - UsbControlTransferParameters, - UsbInTransferResult, - UsbOutTransferResult, - UsbRecipient, - UsbRequestType, - UsbDeviceRequestOptions, -}; -use js_sys::{Array, Uint8Array, Promise, Object}; +use js_sys::{Array, Object, Promise, Uint8Array}; use wasm_bindgen_futures::JsFuture; +use web_sys::{ + console, Usb, UsbControlTransferParameters, UsbDevice as WasmUsbDevice, + UsbDeviceRequestOptions, UsbInTransferResult, UsbInterface as WasmUsbInterface, + UsbOutTransferResult, UsbRecipient, UsbRequestType, +}; // Crate stuff use crate::usb::{ControlIn, ControlOut, ControlType, Device, Interface, Recipient}; @@ -62,15 +55,13 @@ pub async fn get_device(vendor_id: u16, product_id: u16) -> Result dev.into(), Err(err) => { console::log_1(&err.clone()); - return Err(err.into()) - }, + return Err(err.into()); + } }; let _open_promise = JsFuture::from(Promise::resolve(&device.open())).await?; - Ok(UsbDevice { - device - }) + Ok(UsbDevice { device }) } impl Device for UsbDevice { @@ -78,19 +69,20 @@ impl Device for UsbDevice { type UsbInterface = UsbInterface; async fn open_interface(&self, number: u8) -> Result> { - let dev_promise = JsFuture::from(Promise::resolve(&self.device.claim_interface(number))).await; + let dev_promise = + JsFuture::from(Promise::resolve(&self.device.claim_interface(number))).await; // Wait for the interface to be claimed let _device: WasmUsbDevice = match dev_promise { Ok(dev) => dev.into(), Err(err) => { console::log_1(&err.clone()); - return Err(format!("{:?}", err).into()) - }, + return Err(format!("{:?}", err).into()); + } }; Ok(UsbInterface { - device: self.device.clone() + device: self.device.clone(), }) } @@ -158,7 +150,11 @@ impl<'a> Interface<'a> for UsbInterface { let array_obj = Object::try_from(&array).unwrap(); let params: UsbControlTransferParameters = data.into(); - let promise = Promise::resolve(&self.device.control_transfer_out_with_buffer_source(¶ms, array_obj)); + let promise = Promise::resolve( + &self + .device + .control_transfer_out_with_buffer_source(¶ms, array_obj), + ); let result = JsFuture::from(promise).await; match result { @@ -191,7 +187,11 @@ impl<'a> Interface<'a> for UsbInterface { let array = Uint8Array::from(data); let array_obj = Object::try_from(&array).unwrap(); - let promise = Promise::resolve(&self.device.transfer_out_with_buffer_source(endpoint, array_obj)); + let promise = Promise::resolve( + &self + .device + .transfer_out_with_buffer_source(endpoint, array_obj), + ); let result = JsFuture::from(promise).await; @@ -211,7 +211,7 @@ impl From for UsbControlTransferParameters { value.recipient.into(), value.request, value.control_type.into(), - value.value + value.value, ) } } @@ -223,7 +223,7 @@ impl From> for UsbControlTransferParameters { value.recipient.into(), value.request, value.control_type.into(), - value.value + value.value, ) } } diff --git a/src/usb.rs b/src/usb.rs index 826960f..67707a4 100644 --- a/src/usb.rs +++ b/src/usb.rs @@ -1,6 +1,6 @@ #![cfg_attr(debug_assertions, allow(async_fn_in_trait))] -use std::error::Error; use crate::context::UsbInterface; +use std::error::Error; /// A unique USB device pub trait Device { @@ -88,5 +88,5 @@ pub struct ControlOut<'a> { pub request: u8, pub value: u16, pub index: u16, - pub data: &'a[u8], + pub data: &'a [u8], }