summary refs log tree commit diff
diff options
context:
space:
mode:
authorDylan Reid <dgreid@chromium.org>2019-12-19 19:52:05 -0800
committerCommit Bot <commit-bot@chromium.org>2019-12-23 21:20:13 +0000
commit691a61992689653b405fa43518c9b28c2a9f1ece (patch)
tree1251584c9513fe1a5b5996c9fabfe0f75712b432
parente2e6cd8fe6861d8e42a1b57d099c25265acf5c5f (diff)
downloadcrosvm-691a61992689653b405fa43518c9b28c2a9f1ece.tar
crosvm-691a61992689653b405fa43518c9b28c2a9f1ece.tar.gz
crosvm-691a61992689653b405fa43518c9b28c2a9f1ece.tar.bz2
crosvm-691a61992689653b405fa43518c9b28c2a9f1ece.tar.lz
crosvm-691a61992689653b405fa43518c9b28c2a9f1ece.tar.xz
crosvm-691a61992689653b405fa43518c9b28c2a9f1ece.tar.zst
crosvm-691a61992689653b405fa43518c9b28c2a9f1ece.zip
devices: fix warning about extra parens
rust 1.40 has a new warning when there are extra parens, soRemove them.

Change-Id: Ibb565cac41ba8d72879f4cb8b949f2be30e55167
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1978140
Reviewed-by: Stephen Barber <smbarber@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Tested-by: Dylan Reid <dgreid@chromium.org>
Commit-Queue: Dylan Reid <dgreid@chromium.org>
-rw-r--r--devices/src/usb/xhci/device_slot.rs2
-rw-r--r--x86_64/src/lib.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/devices/src/usb/xhci/device_slot.rs b/devices/src/usb/xhci/device_slot.rs
index e2b5e5d..22cfb1d 100644
--- a/devices/src/usb/xhci/device_slot.rs
+++ b/devices/src/usb/xhci/device_slot.rs
@@ -229,7 +229,7 @@ impl PortId {
         *self.0.lock() = 0;
     }
 
-    fn get(&self) -> Result<(u8)> {
+    fn get(&self) -> Result<u8> {
         let val = *self.0.lock();
         if val == 0 {
             return Err(Error::BadPortId(val));
diff --git a/x86_64/src/lib.rs b/x86_64/src/lib.rs
index bb5b675..a2fdf27 100644
--- a/x86_64/src/lib.rs
+++ b/x86_64/src/lib.rs
@@ -631,7 +631,7 @@ impl X8664arch {
         exit_evt: EventFd,
         pci: Option<Arc<Mutex<devices::PciConfigIo>>>,
         mem_size: u64,
-    ) -> Result<(devices::Bus)> {
+    ) -> Result<devices::Bus> {
         struct NoDevice;
         impl devices::BusDevice for NoDevice {
             fn debug_label(&self) -> String {