diff options
author | Zach Reizner <zachr@google.com> | 2018-10-03 10:22:32 -0700 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2018-10-09 21:14:05 -0700 |
commit | 55a9e504beef368bd97e51ffd5a7fa6c034eb8ad (patch) | |
tree | 894d8685e2fdfa105ea35d1cb6cfceee06502c7a /devices/src/virtio/virtio_pci_common_config.rs | |
parent | 046df60760f3b0691f23c27a7f24a96c9afe8c05 (diff) | |
download | crosvm-55a9e504beef368bd97e51ffd5a7fa6c034eb8ad.tar crosvm-55a9e504beef368bd97e51ffd5a7fa6c034eb8ad.tar.gz crosvm-55a9e504beef368bd97e51ffd5a7fa6c034eb8ad.tar.bz2 crosvm-55a9e504beef368bd97e51ffd5a7fa6c034eb8ad.tar.lz crosvm-55a9e504beef368bd97e51ffd5a7fa6c034eb8ad.tar.xz crosvm-55a9e504beef368bd97e51ffd5a7fa6c034eb8ad.tar.zst crosvm-55a9e504beef368bd97e51ffd5a7fa6c034eb8ad.zip |
cargo fmt all source code
Now that cargo fmt has landed, run it over everything at once to bring rust source to the standard formatting. TEST=cargo test BUG=None Change-Id: Ic95a48725e5a40dcbd33ba6d5aef2bd01e91865b Reviewed-on: https://chromium-review.googlesource.com/1259287 Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com> Tested-by: Zach Reizner <zachr@chromium.org> Reviewed-by: Zach Reizner <zachr@chromium.org>
Diffstat (limited to 'devices/src/virtio/virtio_pci_common_config.rs')
-rw-r--r-- | devices/src/virtio/virtio_pci_common_config.rs | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/devices/src/virtio/virtio_pci_common_config.rs b/devices/src/virtio/virtio_pci_common_config.rs index 8a50b35..2793052 100644 --- a/devices/src/virtio/virtio_pci_common_config.rs +++ b/devices/src/virtio/virtio_pci_common_config.rs @@ -138,9 +138,12 @@ impl VirtioPciCommonConfig { // TODO(dverkamp): This hack (copied from MmioDevice) unconditionally // reports support for VIRTIO_F_VERSION_1; once all devices have been // fixed to report VIRTIO_F_VERSION_1, remove this workaround. - device.features(self.device_feature_select) | - if self.device_feature_select == 1 { 0x1 } else { 0x0 } - }, + device.features(self.device_feature_select) | if self.device_feature_select == 1 { + 0x1 + } else { + 0x0 + } + } 0x08 => self.driver_feature_select, _ => 0, } @@ -211,8 +214,8 @@ mod tests { use super::*; use std::os::unix::io::RawFd; - use std::sync::Arc; use std::sync::atomic::AtomicUsize; + use std::sync::Arc; use sys_util::{EventFd, GuestMemory}; struct DummyDevice(u32); @@ -229,12 +232,14 @@ mod tests { fn queue_max_sizes(&self) -> &[u16] { QUEUE_SIZES } - fn activate(&mut self, - _mem: GuestMemory, - _interrupt_evt: EventFd, - _status: Arc<AtomicUsize>, - _queues: Vec<Queue>, - _queue_evts: Vec<EventFd>) { + fn activate( + &mut self, + _mem: GuestMemory, + _interrupt_evt: EventFd, + _status: Arc<AtomicUsize>, + _queues: Vec<Queue>, + _queue_evts: Vec<EventFd>, + ) { } fn features(&self, _page: u32) -> u32 { DUMMY_FEATURES |