diff options
| author | Daniel Verkamp <dverkamp@chromium.org> | 2019-08-13 16:30:25 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-08-20 21:21:26 +0000 |
| commit | b7bee377593ffee4171fd89845e66c84c09b7388 (patch) | |
| tree | 7641d124b798e80aa46b73d336fc0ba38d1a4e26 | |
| parent | 5ce68e42ca69d145bf32d7861c7d8715ab1da987 (diff) | |
| download | crosvm-b7bee377593ffee4171fd89845e66c84c09b7388.tar crosvm-b7bee377593ffee4171fd89845e66c84c09b7388.tar.gz crosvm-b7bee377593ffee4171fd89845e66c84c09b7388.tar.bz2 crosvm-b7bee377593ffee4171fd89845e66c84c09b7388.tar.lz crosvm-b7bee377593ffee4171fd89845e66c84c09b7388.tar.xz crosvm-b7bee377593ffee4171fd89845e66c84c09b7388.tar.zst crosvm-b7bee377593ffee4171fd89845e66c84c09b7388.zip | |
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>
| -rw-r--r-- | gpu_display/src/gpu_display_x.rs | 4 |
1 files 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) { |