summary refs log tree commit diff
path: root/devices/src/virtio/gpu/protocol.rs
diff options
context:
space:
mode:
authorDavid Tolnay <dtolnay@chromium.org>2018-12-01 17:49:30 -0800
committerchrome-bot <chrome-bot@chromium.org>2018-12-03 20:32:03 -0800
commit5bbbf610828e975fd308b90543359a85ef59b67f (patch)
tree4cd736628475d702b7ac45feb2e359c3fb74d220 /devices/src/virtio/gpu/protocol.rs
parent21fb34fb937678d85e9bfa4c721ab4a29196c764 (diff)
downloadcrosvm-5bbbf610828e975fd308b90543359a85ef59b67f.tar
crosvm-5bbbf610828e975fd308b90543359a85ef59b67f.tar.gz
crosvm-5bbbf610828e975fd308b90543359a85ef59b67f.tar.bz2
crosvm-5bbbf610828e975fd308b90543359a85ef59b67f.tar.lz
crosvm-5bbbf610828e975fd308b90543359a85ef59b67f.tar.xz
crosvm-5bbbf610828e975fd308b90543359a85ef59b67f.tar.zst
crosvm-5bbbf610828e975fd308b90543359a85ef59b67f.zip
lint: Resolve the easier clippy lints
Hopefully the changes are self-explanatory and uncontroversial. This
eliminates much of the noise from `cargo clippy` and, for my purposes,
gives me a reasonable way to use it as a tool when writing and reviewing
code.

Here is the Clippy invocation I was using:

    cargo +nightly clippy -- -W clippy::correctness -A renamed_and_removed_lints -Aclippy::{blacklisted_name,borrowed_box,cast_lossless,cast_ptr_alignment,enum_variant_names,identity_op,if_same_then_else,mut_from_ref,needless_pass_by_value,new_without_default,new_without_default_derive,or_fun_call,ptr_arg,should_implement_trait,single_match,too_many_arguments,trivially_copy_pass_by_ref,unreadable_literal,unsafe_vector_initialization,useless_transmute}

TEST=cargo check --features wl-dmabuf,gpu,usb-emulation
TEST=boot linux

Change-Id: I55eb1b4a72beb2f762480e3333a921909314a0a2
Reviewed-on: https://chromium-review.googlesource.com/1356911
Commit-Ready: David Tolnay <dtolnay@chromium.org>
Tested-by: David Tolnay <dtolnay@chromium.org>
Reviewed-by: Dylan Reid <dgreid@chromium.org>
Diffstat (limited to 'devices/src/virtio/gpu/protocol.rs')
-rw-r--r--devices/src/virtio/gpu/protocol.rs36
1 files changed, 18 insertions, 18 deletions
diff --git a/devices/src/virtio/gpu/protocol.rs b/devices/src/virtio/gpu/protocol.rs
index 2001cd7..f3e53a8 100644
--- a/devices/src/virtio/gpu/protocol.rs
+++ b/devices/src/virtio/gpu/protocol.rs
@@ -613,8 +613,8 @@ impl GpuResponse {
             ctx_id: Le32::from(ctx_id),
             padding: Le32::from(0),
         };
-        let len = match self {
-            &GpuResponse::OkDisplayInfo(ref info) => {
+        let len = match *self {
+            GpuResponse::OkDisplayInfo(ref info) => {
                 if info.len() > VIRTIO_GPU_MAX_SCANOUTS {
                     return Err(GpuResponseEncodeError::TooManyDisplays(info.len()));
                 }
@@ -630,7 +630,7 @@ impl GpuResponse {
                 resp.get_ref(0)?.store(disp_info);
                 size_of_val(&disp_info)
             }
-            &GpuResponse::OkCapsetInfo { id, version, size } => {
+            GpuResponse::OkCapsetInfo { id, version, size } => {
                 resp.get_ref(0)?.store(virtio_gpu_resp_capset_info {
                     hdr,
                     capset_id: Le32::from(id),
@@ -640,7 +640,7 @@ impl GpuResponse {
                 });
                 size_of::<virtio_gpu_resp_capset_info>()
             }
-            &GpuResponse::OkCapset(ref data) => {
+            GpuResponse::OkCapset(ref data) => {
                 resp.get_ref(0)?.store(hdr);
                 let resp_data_slice =
                     resp.get_slice(size_of_val(&hdr) as u64, data.len() as u64)?;
@@ -658,26 +658,26 @@ impl GpuResponse {
     /// Gets the `VIRTIO_GPU_*` enum value that corresponds to this variant.
     pub fn get_type(&self) -> u32 {
         match self {
-            &GpuResponse::OkNoData => VIRTIO_GPU_RESP_OK_NODATA,
-            &GpuResponse::OkDisplayInfo(_) => VIRTIO_GPU_RESP_OK_DISPLAY_INFO,
-            &GpuResponse::OkCapsetInfo { .. } => VIRTIO_GPU_RESP_OK_CAPSET_INFO,
-            &GpuResponse::OkCapset(_) => VIRTIO_GPU_RESP_OK_CAPSET,
-            &GpuResponse::ErrUnspec => VIRTIO_GPU_RESP_ERR_UNSPEC,
-            &GpuResponse::ErrOutOfMemory => VIRTIO_GPU_RESP_ERR_OUT_OF_MEMORY,
-            &GpuResponse::ErrInvalidScanoutId => VIRTIO_GPU_RESP_ERR_INVALID_SCANOUT_ID,
-            &GpuResponse::ErrInvalidResourceId => VIRTIO_GPU_RESP_ERR_INVALID_RESOURCE_ID,
-            &GpuResponse::ErrInvalidContextId => VIRTIO_GPU_RESP_ERR_INVALID_CONTEXT_ID,
-            &GpuResponse::ErrInvalidParameter => VIRTIO_GPU_RESP_ERR_INVALID_PARAMETER,
+            GpuResponse::OkNoData => VIRTIO_GPU_RESP_OK_NODATA,
+            GpuResponse::OkDisplayInfo(_) => VIRTIO_GPU_RESP_OK_DISPLAY_INFO,
+            GpuResponse::OkCapsetInfo { .. } => VIRTIO_GPU_RESP_OK_CAPSET_INFO,
+            GpuResponse::OkCapset(_) => VIRTIO_GPU_RESP_OK_CAPSET,
+            GpuResponse::ErrUnspec => VIRTIO_GPU_RESP_ERR_UNSPEC,
+            GpuResponse::ErrOutOfMemory => VIRTIO_GPU_RESP_ERR_OUT_OF_MEMORY,
+            GpuResponse::ErrInvalidScanoutId => VIRTIO_GPU_RESP_ERR_INVALID_SCANOUT_ID,
+            GpuResponse::ErrInvalidResourceId => VIRTIO_GPU_RESP_ERR_INVALID_RESOURCE_ID,
+            GpuResponse::ErrInvalidContextId => VIRTIO_GPU_RESP_ERR_INVALID_CONTEXT_ID,
+            GpuResponse::ErrInvalidParameter => VIRTIO_GPU_RESP_ERR_INVALID_PARAMETER,
         }
     }
 
     /// Returns true if this response indicates success.
     pub fn is_ok(&self) -> bool {
         match self {
-            &GpuResponse::OkNoData => true,
-            &GpuResponse::OkDisplayInfo(_) => true,
-            &GpuResponse::OkCapsetInfo { .. } => true,
-            &GpuResponse::OkCapset(_) => true,
+            GpuResponse::OkNoData => true,
+            GpuResponse::OkDisplayInfo(_) => true,
+            GpuResponse::OkCapsetInfo { .. } => true,
+            GpuResponse::OkCapset(_) => true,
             _ => false,
         }
     }