summary refs log tree commit diff
path: root/devices
diff options
context:
space:
mode:
authorDaniel Verkamp <dverkamp@chromium.org>2018-10-30 09:24:51 -0700
committerchrome-bot <chrome-bot@chromium.org>2018-10-31 12:42:26 -0700
commiteeebe63c43482ee6a52b9ff480724f2ae60db821 (patch)
treea148ae13bca616aab84bcefd8e4be727b9adb7af /devices
parentf28a864fd9dc5adaec0c65f4737560556861859d (diff)
downloadcrosvm-eeebe63c43482ee6a52b9ff480724f2ae60db821.tar
crosvm-eeebe63c43482ee6a52b9ff480724f2ae60db821.tar.gz
crosvm-eeebe63c43482ee6a52b9ff480724f2ae60db821.tar.bz2
crosvm-eeebe63c43482ee6a52b9ff480724f2ae60db821.tar.lz
crosvm-eeebe63c43482ee6a52b9ff480724f2ae60db821.tar.xz
crosvm-eeebe63c43482ee6a52b9ff480724f2ae60db821.tar.zst
crosvm-eeebe63c43482ee6a52b9ff480724f2ae60db821.zip
cargo fmt with Rust 1.30.0
Rust 1.30.0 ships a new rustfmt that causes a few more formatting
changes.

BUG=None
TEST=Run kokoro tests with updated Rust version

Change-Id: I803765ec0f3d2447f627b1e990bce438512367f7
Signed-off-by: Daniel Verkamp <dverkamp@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1307816
Commit-Ready: ChromeOS CL Exonerator Bot <chromiumos-cl-exonerator@appspot.gserviceaccount.com>
Reviewed-by: Zach Reizner <zachr@chromium.org>
Reviewed-by: Dylan Reid <dgreid@chromium.org>
Diffstat (limited to 'devices')
-rw-r--r--devices/src/virtio/wl.rs22
1 files changed, 11 insertions, 11 deletions
diff --git a/devices/src/virtio/wl.rs b/devices/src/virtio/wl.rs
index 1933be5..0b973bd 100644
--- a/devices/src/virtio/wl.rs
+++ b/devices/src/virtio/wl.rs
@@ -1440,17 +1440,17 @@ impl Worker {
                             as u32;
                         self.in_desc_chains
                             .extend(self.in_queue.iter(&self.mem).filter_map(|d| {
-                            if d.len >= min_in_desc_len && d.is_write_only() {
-                                Some((d.index, d.addr, d.len))
-                            } else {
-                                // Can not use queue.add_used directly because it's being borrowed
-                                // for the iterator chain, so we buffer the descriptor index in
-                                // rejects.
-                                rejects[rejects_len] = d.index;
-                                rejects_len += 1;
-                                None
-                            }
-                        }));
+                                if d.len >= min_in_desc_len && d.is_write_only() {
+                                    Some((d.index, d.addr, d.len))
+                                } else {
+                                    // Can not use queue.add_used directly because it's being borrowed
+                                    // for the iterator chain, so we buffer the descriptor index in
+                                    // rejects.
+                                    rejects[rejects_len] = d.index;
+                                    rejects_len += 1;
+                                    None
+                                }
+                            }));
                         for &reject in &rejects[..rejects_len] {
                             signal_used = true;
                             self.in_queue.add_used(&self.mem, reject, 0);