Remove unneeded boxing

haimgel · Oct 25, 2023 · 9f4c4bb · 9f4c4bb
1 parent 2369a31
commit 9f4c4bb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/app.rs b/src/app.rs
@@ -47,7 +47,7 @@ impl App {
 
     pub fn run(self) -> Result<()> {
         display_control::log_current_source();
-        let pnp_detector = PnPDetect::new(Box::new(self));
+        let pnp_detector = PnPDetect::new(&self);
         pnp_detector.detect()?;
 
         Ok(())

diff --git a/src/platform/pnp_detect_windows.rs b/src/platform/pnp_detect_windows.rs
@@ -22,14 +22,14 @@ use winapi::um::winuser::{
 /// Detection of plugged in / removed USB devices on Windows: listens for WM_DEVICECHANGE messages.
 /// This code should be removed once libusb supports hotplug notifications on Windows:
 /// https://github.com/libusb/libusb/issues/86
-pub struct PnPDetectWindows {
+pub struct PnPDetectWindows<'a> {
     hwnd: HWND,
-    callback: Box<dyn UsbCallback>,
+    callback: &'a dyn UsbCallback,
     current_devices: HashSet<String>,
 }
 
-impl PnPDetectWindows {
-    pub fn new(callback: Box<dyn UsbCallback>) -> Self {
+impl<'a> PnPDetectWindows<'a> {
+    pub fn new(callback: &'a (dyn UsbCallback + 'a)) -> Self {
         let mut pnp_detect = Self {
             callback,
             current_devices: Self::read_device_list().unwrap_or_default(),