summary refs log tree commit diff
path: root/kernel_loader
diff options
context:
space:
mode:
authorDaniel Verkamp <dverkamp@chromium.org>2019-10-16 13:16:32 -0700
committerCommit Bot <commit-bot@chromium.org>2019-11-08 22:18:16 +0000
commit6787ff3f0f7ce9cd5576189dc34ae03cb6ad9421 (patch)
tree48f0e34fc935c97ed6f9b3c9d956805265b44ac4 /kernel_loader
parent7a5a7fc44ffc434192d109b1d889a4f7037fab0c (diff)
downloadcrosvm-6787ff3f0f7ce9cd5576189dc34ae03cb6ad9421.tar
crosvm-6787ff3f0f7ce9cd5576189dc34ae03cb6ad9421.tar.gz
crosvm-6787ff3f0f7ce9cd5576189dc34ae03cb6ad9421.tar.bz2
crosvm-6787ff3f0f7ce9cd5576189dc34ae03cb6ad9421.tar.lz
crosvm-6787ff3f0f7ce9cd5576189dc34ae03cb6ad9421.tar.xz
crosvm-6787ff3f0f7ce9cd5576189dc34ae03cb6ad9421.tar.zst
crosvm-6787ff3f0f7ce9cd5576189dc34ae03cb6ad9421.zip
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>
Diffstat (limited to 'kernel_loader')
-rw-r--r--kernel_loader/src/lib.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel_loader/src/lib.rs b/kernel_loader/src/lib.rs
index d878d06..31804da 100644
--- a/kernel_loader/src/lib.rs
+++ b/kernel_loader/src/lib.rs
@@ -164,7 +164,7 @@ pub fn load_cmdline(
         .checked_add(len as u64 + 1)
         .ok_or(Error::CommandLineOverflow)?; // Extra for null termination.
     if end > guest_mem.end_addr() {
-        return Err(Error::CommandLineOverflow)?;
+        return Err(Error::CommandLineOverflow);
     }
 
     guest_mem