From 275c1ef45db270b9cf0d7c614e5bdf59cb91bb41 Mon Sep 17 00:00:00 2001
From: Keiichi Watanabe <keiichiw@chromium.org>
Date: Fri, 10 Apr 2020 21:49:10 +0900
Subject: crosvm: Apply cargo fix for some clippy errors

Executed the following command to fix trivial style problems automatically.
$ rustup run nightly cargo fix -Z unstable-options --clippy \
  --all-features --all-targets

BUG=chromium:908640
TEST=build

Change-Id: I8a42806dc573b25d4ca918112e7b420793261d37
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/2145537
Tested-by: Keiichi Watanabe <keiichiw@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Commit-Queue: Keiichi Watanabe <keiichiw@chromium.org>
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Reviewed-by: Zach Reizner <zachr@chromium.org>
---
 src/argument.rs | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'src/argument.rs')

diff --git a/src/argument.rs b/src/argument.rs
index 9c00ae5..02e97f0 100644
--- a/src/argument.rs
+++ b/src/argument.rs
@@ -292,14 +292,12 @@ where
                     State::Positional
                 }
                 State::Value { name } => {
-                    if arg.starts_with("-") {
+                    if arg.starts_with('-') {
                         arg_consumed = false;
                         f(&name, None)?;
-                    } else {
-                        if let Err(e) = f(&name, Some(&arg)) {
-                            arg_consumed = false;
-                            f(&name, None).map_err(|_| e)?;
-                        }
+                    } else if let Err(e) = f(&name, Some(&arg)) {
+                        arg_consumed = false;
+                        f(&name, None).map_err(|_| e)?;
                     }
                     State::Top
                 }
-- 
cgit 1.4.1