summary refs log tree commit diff
path: root/src/plugin
diff options
context:
space:
mode:
authorDavid Tolnay <dtolnay@chromium.org>2019-04-12 19:16:38 -0700
committerchrome-bot <chrome-bot@chromium.org>2019-04-17 17:22:52 -0700
commit9239602d69306a45da78a595bed4a02aef105ea5 (patch)
treefe098a48194edcd9d84220a653113ee4a6ee175b /src/plugin
parentc2d71acc45313767773b7c6c0cdf479eeb6d9af5 (diff)
downloadcrosvm-9239602d69306a45da78a595bed4a02aef105ea5.tar
crosvm-9239602d69306a45da78a595bed4a02aef105ea5.tar.gz
crosvm-9239602d69306a45da78a595bed4a02aef105ea5.tar.bz2
crosvm-9239602d69306a45da78a595bed4a02aef105ea5.tar.lz
crosvm-9239602d69306a45da78a595bed4a02aef105ea5.tar.xz
crosvm-9239602d69306a45da78a595bed4a02aef105ea5.tar.zst
crosvm-9239602d69306a45da78a595bed4a02aef105ea5.zip
clippy: Resolve needless_return
TEST=bin/clippy

Change-Id: I62eb3f86b01a6000107c54a967689d4e430adf50
Reviewed-on: https://chromium-review.googlesource.com/1566743
Commit-Ready: David Tolnay <dtolnay@chromium.org>
Tested-by: David Tolnay <dtolnay@chromium.org>
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Diffstat (limited to 'src/plugin')
-rw-r--r--src/plugin/mod.rs12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/plugin/mod.rs b/src/plugin/mod.rs
index 60a50da..c01ff80 100644
--- a/src/plugin/mod.rs
+++ b/src/plugin/mod.rs
@@ -733,11 +733,11 @@ pub fn run_config(cfg: Config) -> Result<()> {
 
     match plugin.try_wait() {
         // The plugin has run out of time by now
-        Ok(ProcessStatus::Running) => return Err(Error::PluginTimeout),
+        Ok(ProcessStatus::Running) => Err(Error::PluginTimeout),
         // Return an error discovered earlier in this function.
-        Ok(ProcessStatus::Success) => return res,
-        Ok(ProcessStatus::Fail(code)) => return Err(Error::PluginFailed(code)),
-        Ok(ProcessStatus::Signal(code)) => return Err(Error::PluginKilled(code)),
-        Err(e) => return Err(Error::PluginWait(e)),
-    };
+        Ok(ProcessStatus::Success) => res,
+        Ok(ProcessStatus::Fail(code)) => Err(Error::PluginFailed(code)),
+        Ok(ProcessStatus::Signal(code)) => Err(Error::PluginKilled(code)),
+        Err(e) => Err(Error::PluginWait(e)),
+    }
 }