Merge pull request #87 from eldruin/small-simplifications

Small code simplifications

Author: eldruin

src/control_pipe.rs

@@ -122,7 +122,7 @@ impl<B: UsbBus> ControlPipe<'_, B> {
             return Some(req);
         }
 
-        return None;
+        None
     }
 
     pub fn handle_out<'p>(&'p mut self) -> Option<Request> {
@@ -160,7 +160,7 @@ impl<B: UsbBus> ControlPipe<'_, B> {
             }
         }
 
-        return None;
+        None
     }
 
     pub fn handle_in_complete(&mut self) -> bool {
@@ -191,7 +191,7 @@ impl<B: UsbBus> ControlPipe<'_, B> {
             }
         };
 
-        return false;
+        false
     }
 
     fn write_in_chunk(&mut self) {

src/descriptor.rs

@@ -372,7 +372,7 @@ pub struct BosWriter<'w, 'a: 'w> {
 impl<'w, 'a: 'w> BosWriter<'w, 'a> {
     pub(crate) fn new(writer: &'w mut DescriptorWriter<'a>) -> Self {
         Self {
-            writer: writer,
+            writer,
             num_caps_mark: None,
         }
     }

src/device.rs

@@ -193,13 +193,14 @@ impl<B: UsbBus> UsbDevice<'_, B> {
                     if (ep_in_complete & 1) != 0 {
                         let completed = self.control.handle_in_complete();
 
-                        if !B::QUIRK_SET_ADDRESS_BEFORE_STATUS {
-                            if completed && self.pending_address != 0 {
-                                self.bus.set_device_address(self.pending_address);
-                                self.pending_address = 0;
+                        if !B::QUIRK_SET_ADDRESS_BEFORE_STATUS
+                            && completed
+                            && self.pending_address != 0
+                        {
+                            self.bus.set_device_address(self.pending_address);
+                            self.pending_address = 0;
 
-                                self.device_state = UsbDeviceState::Addressed;
-                            }
+                            self.device_state = UsbDeviceState::Addressed;
                         }
                     }
 
@@ -275,7 +276,7 @@ impl<B: UsbBus> UsbDevice<'_, B> {
             }
         }
 
-        return false;
+        false
     }
 
     fn control_in(&mut self, classes: &mut ClassList<'_, B>, req: control::Request) {
@@ -508,7 +509,7 @@ impl<B: UsbBus> UsbDevice<'_, B> {
                             classes
                                 .iter()
                                 .filter_map(|cls| cls.get_string(index, lang_id))
-                                .nth(0)
+                                .next()
                         }
                     };
 

src/endpoint.rs

@@ -1,7 +1,6 @@
 use crate::bus::UsbBus;
 use crate::{Result, UsbDirection};
 use core::marker::PhantomData;
-use core::ptr;
 use core::sync::atomic::{AtomicPtr, Ordering};
 
 /// Trait for endpoint type markers.
@@ -77,7 +76,7 @@ impl<B: UsbBus, D: EndpointDirection> Endpoint<'_, B, D> {
 
     fn bus(&self) -> &B {
         let bus_ptr = self.bus_ptr.load(Ordering::SeqCst);
-        if bus_ptr == ptr::null_mut() {
+        if bus_ptr.is_null() {
             panic!("UsbBus initialization not complete");
         }
 

src/test_class.rs

@@ -46,11 +46,11 @@ pub struct TestClass<'a, B: UsbBus> {
 
 pub const VID: u16 = 0x16c0;
 pub const PID: u16 = 0x05dc;
-pub const MANUFACTURER: &'static str = "TestClass Manufacturer";
-pub const PRODUCT: &'static str = "virkkunen.net usb-device TestClass";
-pub const SERIAL_NUMBER: &'static str = "TestClass Serial";
-pub const CUSTOM_STRING: &'static str = "TestClass Custom String";
-pub const INTERFACE_STRING: &'static str = "TestClass Interface";
+pub const MANUFACTURER: &str = "TestClass Manufacturer";
+pub const PRODUCT: &str = "virkkunen.net usb-device TestClass";
+pub const SERIAL_NUMBER: &str = "TestClass Serial";
+pub const CUSTOM_STRING: &str = "TestClass Custom String";
+pub const INTERFACE_STRING: &str = "TestClass Interface";
 
 pub const REQ_STORE_REQUEST: u8 = 1;
 pub const REQ_READ_BUFFER: u8 = 2;
@@ -59,7 +59,7 @@ pub const REQ_SET_BENCH_ENABLED: u8 = 4;
 pub const REQ_READ_LONG_DATA: u8 = 5;
 pub const REQ_UNKNOWN: u8 = 42;
 
-pub const LONG_DATA: &'static [u8] = &[0x17; 257];
+pub const LONG_DATA: &[u8] = &[0x17; 257];
 
 impl<B: UsbBus> TestClass<'_, B> {
     /// Creates a new TestClass.
@@ -105,7 +105,7 @@ impl<B: UsbBus> TestClass<'_, B> {
         &'a self,
         usb_bus: &'b UsbBusAllocator<B>,
     ) -> UsbDeviceBuilder<'b, B> {
-        UsbDeviceBuilder::new(&usb_bus, UsbVidPid(VID, PID))
+        UsbDeviceBuilder::new(usb_bus, UsbVidPid(VID, PID))
             .manufacturer(MANUFACTURER)
             .product(PRODUCT)
             .serial_number(SERIAL_NUMBER)