From b7bee377593ffee4171fd89845e66c84c09b7388 Mon Sep 17 00:00:00 2001
From: Daniel Verkamp <dverkamp@chromium.org>
Date: Tue, 13 Aug 2019 16:30:25 -0700
Subject: gpu_display: fix clippy warnings

Remove a redundant closure and an unneeded return statement to assuage
`cargo clippy`.

BUG=None
TEST=bin/clippy

Change-Id: I4b6043738de0be3bbf73d05fb3e4c909ce48bc58
Signed-off-by: Daniel Verkamp <dverkamp@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1751912
Reviewed-by: Zach Reizner <zachr@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
---
 gpu_display/src/gpu_display_x.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gpu_display/src/gpu_display_x.rs b/gpu_display/src/gpu_display_x.rs
index 62ee505..837a151 100644
--- a/gpu_display/src/gpu_display_x.rs
+++ b/gpu_display/src/gpu_display_x.rs
@@ -459,7 +459,7 @@ pub struct DisplayX {
 
 impl DisplayX {
     pub fn open_display(display: Option<&str>) -> Result<DisplayX, GpuDisplayError> {
-        let display_cstr = match display.map(|s| CString::new(s)) {
+        let display_cstr = match display.map(CString::new) {
             Some(Ok(s)) => Some(s),
             Some(Err(_)) => return Err(GpuDisplayError::InvalidPath),
             None => None,
@@ -620,7 +620,7 @@ impl DisplayT for DisplayX {
         height: u32,
         fourcc: u32,
     ) -> Result<u32, GpuDisplayError> {
-        return Err(GpuDisplayError::Unsupported);
+        Err(GpuDisplayError::Unsupported)
     }
     #[allow(unused_variables)]
     fn release_import(&mut self, import_id: u32) {
-- 
cgit 1.4.1