refactor: migrate from rusb to nusb 0.2

.github/workflows/ci.yml

@@ -33,8 +33,6 @@ jobs:
             arch: linux-x64
           - os: macos-latest
             arch: macos-arm64
-          - os: macos-13
-            arch: macos-x64
     runs-on: ${{ matrix.config.os }}
 
     steps:

Cargo.toml

@@ -23,7 +23,7 @@ hex = "0.4.3"
 ihex = "3.0.0"
 log = "0.4"
 nu-pretty-hex = "0.109"
-rusb = "0.9.1"
+nusb = "0.2"
 simplelog = "0.12.0"
 thiserror = "2"
 object = { version = "0.38", default-features = false, features = [
@@ -32,7 +32,7 @@ object = { version = "0.38", default-features = false, features = [
     "std",
 ] }
 indicatif = "0.18"
-serialport = "4.6"
+serialport = "4.7"
 libloading = "0.9"
 chrono = "0.4"
 clap-verbosity-flag = "3"

src/commands/control.rs

@@ -1,6 +1,6 @@
 //! Probe control commands. COMMAND_ID = 0x0d
 
-use crate::{probe::WchLinkVariant, RiscvChip};
+use crate::{RiscvChip, probe::WchLinkVariant};
 
 use super::*;
 

src/error.rs

@@ -10,7 +10,7 @@ pub enum Error {
     #[error("{0}")]
     Custom(String),
     #[error("USB error: {0}")]
-    Rusb(#[from] rusb::Error),
+    Usb(nusb::Error),
     #[error("WCH-Link not found, please check your connection")]
     ProbeNotFound,
     #[error("WCH-Link is connected, but is not in RV mode")]
@@ -21,7 +21,9 @@ pub enum Error {
     UnknownLinkVariant(u8),
     #[error("Unknown RISC-V Chip: 0x{0:02x}")]
     UnknownChip(u8),
-    #[error("Probe is not attached to an MCU, or debug is not enabled. (hint: use wchisp to enable debug)")]
+    #[error(
+        "Probe is not attached to an MCU, or debug is not enabled. (hint: use wchisp to enable debug)"
+    )]
     NotAttached,
     #[error("Chip mismatch: expected {0:?}, got {1:?}")]
     ChipMismatch(RiscvChip, RiscvChip),

src/firmware.rs

@@ -4,8 +4,8 @@ use std::str;
 
 use anyhow::Result;
 use object::{
-    elf::FileHeader32, elf::PT_LOAD, read::elf::FileHeader, read::elf::ProgramHeader, Endianness,
-    Object, ObjectSection,
+    Endianness, Object, ObjectSection, elf::FileHeader32, elf::PT_LOAD, read::elf::FileHeader,
+    read::elf::ProgramHeader,
 };
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
@@ -206,11 +206,11 @@ pub fn read_elf(elf_data: &[u8]) -> Result<Firmware> {
             .map_err(|_| anyhow::format_err!("Failed to access data for an ELF segment."))?;
         if !segment_data.is_empty() && segment.p_type(endian) == PT_LOAD {
             log::debug!(
-                    "Found loadable segment, physical address: {:#010x}, virtual address: {:#010x}, flags: {:#x}",
-                    p_paddr,
-                    p_vaddr,
-                    flags
-                );
+                "Found loadable segment, physical address: {:#010x}, virtual address: {:#010x}, flags: {:#x}",
+                p_paddr,
+                p_vaddr,
+                flags
+            );
             let (segment_offset, segment_filesize) = segment.file_range(endian);
             let mut section_names = vec![];
             for section in binary.sections() {