From 76cf0e6bf62e5607a2987bc97dda7104f075a125 Mon Sep 17 00:00:00 2001
From: Clarissa Garvey <clarissagarvey@chromium.org>
Date: Sat, 19 Nov 2022 01:01:21 +0000
Subject: [PATCH] Fix straggler needless_return violations

These are not caught during presubmit or when running cargo clippy but
nonetheless exist and should be cleaned up.

BUG=b:157245930, crbug:908640
TEST=cargo build

Change-Id: I8b4d79bf224b800fbdfeaa7729c5f283d42908e9
Reviewed-on: https://chromium-review.googlesource.com/c/crosvm/crosvm/+/4039522
Auto-Submit: Clarissa Garvey <clarissagarvey@chromium.org>
Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Commit-Queue: Daniel Verkamp <dverkamp@chromium.org>
---
 cros_async/src/audio_streams_async.rs  | 4 ++--
 cros_async/src/sys/unix/async_types.rs | 5 +++--
 tpm2-sys/build.rs                      | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/cros_async/src/audio_streams_async.rs b/cros_async/src/audio_streams_async.rs
index d5a787b1fd..d5a2ce6230 100644
--- a/cros_async/src/audio_streams_async.rs
+++ b/cros_async/src/audio_streams_async.rs
@@ -78,9 +78,9 @@ impl EventAsyncWrapper for EventAsync {
 impl AudioStreamsExecutor for super::Executor {
     #[cfg(unix)]
     fn async_unix_stream(&self, stream: UnixStream) -> Result<AsyncStream> {
-        return Ok(Box::new(IoSourceWrapper {
+        Ok(Box::new(IoSourceWrapper {
             source: self.async_from(AsyncWrapper::new(stream))?,
-        }));
+        }))
     }
 
     /// # Safety
diff --git a/cros_async/src/sys/unix/async_types.rs b/cros_async/src/sys/unix/async_types.rs
index 94aa512d1f..e02fd380a0 100644
--- a/cros_async/src/sys/unix/async_types.rs
+++ b/cros_async/src/sys/unix/async_types.rs
@@ -19,10 +19,11 @@ pub struct AsyncTube {
 
 impl AsyncTube {
     pub fn new(ex: &Executor, tube: Tube) -> io::Result<AsyncTube> {
-        return Ok(AsyncTube {
+        Ok(AsyncTube {
             inner: ex.async_from(tube)?,
-        });
+        })
     }
+
     pub async fn next<T: DeserializeOwned>(&self) -> TubeResult<T> {
         self.inner.wait_readable().await.unwrap();
         self.inner.as_source().recv()
diff --git a/tpm2-sys/build.rs b/tpm2-sys/build.rs
index 0df106998f..997bba7311 100644
--- a/tpm2-sys/build.rs
+++ b/tpm2-sys/build.rs
@@ -26,7 +26,7 @@ fn get_cross_compile_prefix() -> String {
     } else {
         env::var("CARGO_CFG_TARGET_ENV").unwrap()
     };
-    return format!("{}-{}-{}-", arch, os, env);
+    format!("{}-{}-{}-", arch, os, env)
 }
 
 fn build_libtpm2(out_dir: &Path) -> Result<()> {