From d8ff7fa7e47c6545d2f2083580fe6ab408e1ce7b Mon Sep 17 00:00:00 2001 From: Daniel Verkamp Date: Fri, 30 Apr 2021 13:34:13 -0700 Subject: [PATCH] devices: fix redundant ? inside Ok Fixes a new clippy warning ("Question mark operator is useless here"). https://rust-lang.github.io/rust-clippy/master/index.html#needless_question_mark BUG=None TEST=bin/clippy Change-Id: I2888f070030d2838b8fb63e5d98a929f57cdfde7 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2864369 Reviewed-by: Dylan Reid Tested-by: Daniel Verkamp Commit-Queue: Daniel Verkamp --- devices/src/virtio/video/decoder/backend/vda.rs | 4 ++-- rutabaga_gfx/src/rutabaga_gralloc/rendernode.rs | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/devices/src/virtio/video/decoder/backend/vda.rs b/devices/src/virtio/video/decoder/backend/vda.rs index 1ef2cf87c8..f11a3a6bc6 100644 --- a/devices/src/virtio/video/decoder/backend/vda.rs +++ b/devices/src/virtio/video/decoder/backend/vda.rs @@ -176,9 +176,9 @@ impl DecoderBackend for libvda::decode::VdaInstance { fn new_session(&self, format: Format) -> VideoResult { let profile = libvda::Profile::try_from(format)?; - Ok(self.open_session(profile).map_err(|e| { + self.open_session(profile).map_err(|e| { error!("failed to open a session for {:?}: {}", format, e); VideoError::InvalidOperation - })?) + }) } } diff --git a/rutabaga_gfx/src/rutabaga_gralloc/rendernode.rs b/rutabaga_gfx/src/rutabaga_gralloc/rendernode.rs index bfef3679f0..9972ab5d5e 100644 --- a/rutabaga_gfx/src/rutabaga_gralloc/rendernode.rs +++ b/rutabaga_gfx/src/rutabaga_gralloc/rendernode.rs @@ -80,10 +80,10 @@ fn get_drm_device_name(fd: &File) -> Result { return Err(()); } - Ok(CString::new(&name_bytes[..(version.name_len as usize)]) + CString::new(&name_bytes[..(version.name_len as usize)]) .map_err(|_| ())? .into_string() - .map_err(|_| ())?) + .map_err(|_| ()) } /// Returns a `fd` for an opened rendernode device, while filtering out specified