Update usbd-serial and nrf-usbd to match, and fix build.

Author: qwandor

examples/usb/Cargo.toml

@@ -6,10 +6,10 @@ edition = "2018"
 publish = false
 
 [dependencies]
-cortex-m-rt = "0.7.0"
+cortex-m-rt = "0.7.3"
 panic-semihosting = "0.6.0"
 usb-device = "0.3.2"
-usbd-serial = "0.1.0"
+usbd-serial = "0.2.1"
 
 [dependencies.nrf52840-hal]
 path = "../../nrf52840-hal"

examples/usb/src/bin/serial.rs

@@ -7,7 +7,7 @@ use cortex_m_rt::entry;
 use nrf52840_hal::clocks::Clocks;
 use nrf52840_hal::usbd::{UsbPeripheral, Usbd};
 use usb_device::class_prelude::UsbBusAllocator;
-use usb_device::device::{UsbDeviceBuilder, UsbVidPid};
+use usb_device::device::{StringDescriptors, UsbDeviceBuilder, UsbVidPid};
 use usbd_serial::{SerialPort, USB_CLASS_CDC};
 
 #[entry]
@@ -20,11 +20,14 @@ fn main() -> ! {
     let mut serial = SerialPort::new(&usb_bus);
 
     let mut usb_dev = UsbDeviceBuilder::new(&usb_bus, UsbVidPid(0x16c0, 0x27dd))
-        .manufacturer("Fake company")
-        .product("Serial port")
-        .serial_number("TEST")
+        .strings(&[StringDescriptors::default()
+            .manufacturer("Fake company")
+            .product("Serial port")
+            .serial_number("TEST")])
+        .unwrap()
         .device_class(USB_CLASS_CDC)
         .max_packet_size_0(64) // (makes control transfers 8x faster)
+        .unwrap()
         .build();
 
     loop {

nrf-hal-common/Cargo.toml

@@ -73,7 +73,7 @@ optional = true
 version = "0.12.2"
 
 [dependencies.nrf-usbd]
-version = "0.2.0"
+version = "0.3.0"
 optional = true
 
 [dependencies.embedded-hal-02]