From 6787ff3f0f7ce9cd5576189dc34ae03cb6ad9421 Mon Sep 17 00:00:00 2001
From: Daniel Verkamp <dverkamp@chromium.org>
Date: Wed, 16 Oct 2019 13:16:32 -0700
Subject: Remove unnecessary ? when returning Err

Fixes warnings of the form "returning an `Err(_)` with the `?` operator"
from clippy.

BUG=None
TEST=bin/clippy

Change-Id: Ied9c0bfbd71ad825fe88c861160e59db491efdd3
Signed-off-by: Daniel Verkamp <dverkamp@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1896086
Reviewed-by: Zach Reizner <zachr@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
---
 data_model/src/volatile_memory.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'data_model')

diff --git a/data_model/src/volatile_memory.rs b/data_model/src/volatile_memory.rs
index e081189..c02111e 100644
--- a/data_model/src/volatile_memory.rs
+++ b/data_model/src/volatile_memory.rs
@@ -163,7 +163,7 @@ impl<'a> VolatileSlice<'a> {
             return Err(VolatileMemoryError::Overflow {
                 base: self.addr as u64,
                 offset: count,
-            })?;
+            });
         }
         let new_size = self
             .size
-- 
cgit 1.4.1