summary refs log tree commit diff
path: root/devices/src/virtio/gpu
diff options
context:
space:
mode:
authorJakub Staron <jstaron@google.com>2019-06-05 15:18:25 -0700
committerCommit Bot <commit-bot@chromium.org>2019-06-08 04:27:37 +0000
commitb6515a91675935dcaa9833c4a64c8a35b0971edb (patch)
tree223082ccfa46de7ef84b5d8bc931cda7f7cc2e0e /devices/src/virtio/gpu
parentd879219ac07bea9e4d6dda8c95fdc039e095f642 (diff)
downloadcrosvm-b6515a91675935dcaa9833c4a64c8a35b0971edb.tar
crosvm-b6515a91675935dcaa9833c4a64c8a35b0971edb.tar.gz
crosvm-b6515a91675935dcaa9833c4a64c8a35b0971edb.tar.bz2
crosvm-b6515a91675935dcaa9833c4a64c8a35b0971edb.tar.lz
crosvm-b6515a91675935dcaa9833c4a64c8a35b0971edb.tar.xz
crosvm-b6515a91675935dcaa9833c4a64c8a35b0971edb.tar.zst
crosvm-b6515a91675935dcaa9833c4a64c8a35b0971edb.zip
crosvm: fix clippy warnings
Resolve a couple of minor clippy warnings:
 - unneeded return statement
 - use `if let` instead of `match` for single pattern destruction
 - use `values()` function to iterate over map values
 - supress warning about `ptr::null()` as expressed by the comment

BUG=None
TEST=./bin/clippy
TEST=cargo build

Change-Id: Ic4cea94cd3a25a9edf6ef38119de8c46dcfec563
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1646739
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Zach Reizner <zachr@chromium.org>
Reviewed-by: Stephen Barber <smbarber@chromium.org>
Commit-Queue: Jakub StaroĊ„ <jstaron@google.com>
Diffstat (limited to 'devices/src/virtio/gpu')
-rw-r--r--devices/src/virtio/gpu/backend.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/devices/src/virtio/gpu/backend.rs b/devices/src/virtio/gpu/backend.rs
index e53adb3..e441541 100644
--- a/devices/src/virtio/gpu/backend.rs
+++ b/devices/src/virtio/gpu/backend.rs
@@ -725,11 +725,11 @@ impl Backend {
     }
 
     pub fn allocate_using_minigbm(args: ResourceCreateArgs) -> bool {
-        return args.bind & VIRGL_RES_BIND_SCANOUT != 0
+        args.bind & VIRGL_RES_BIND_SCANOUT != 0
             && args.depth == 1
             && args.array_size == 1
             && args.last_level == 0
-            && args.nr_samples == 0;
+            && args.nr_samples == 0
     }
 
     /// Creates a 3D resource with the given properties and associated it with the given id.