diff options
| author | Jakub Staron <jstaron@google.com> | 2019-06-05 14:50:46 -0700 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-06-08 04:27:37 +0000 |
| commit | d879219ac07bea9e4d6dda8c95fdc039e095f642 (patch) | |
| tree | 5507b6c82a1e060881e39bdc1f7721393af2a649 | |
| parent | 4197d3a3a14ee79a5c313d709773178c1aac18fa (diff) | |
| download | crosvm-d879219ac07bea9e4d6dda8c95fdc039e095f642.tar crosvm-d879219ac07bea9e4d6dda8c95fdc039e095f642.tar.gz crosvm-d879219ac07bea9e4d6dda8c95fdc039e095f642.tar.bz2 crosvm-d879219ac07bea9e4d6dda8c95fdc039e095f642.tar.lz crosvm-d879219ac07bea9e4d6dda8c95fdc039e095f642.tar.xz crosvm-d879219ac07bea9e4d6dda8c95fdc039e095f642.tar.zst crosvm-d879219ac07bea9e4d6dda8c95fdc039e095f642.zip | |
serial: fix clippy warnings
Resolve couple of minor clippy warnings: - unneeded return statement in last expression of the function - redundant closure BUG=None TEST=./bin/clippy TEST=cargo build Change-Id: I602e56289315cb88779c0029d400b24a8180b899 Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/1646738 Tested-by: kokoro <noreply+kokoro@google.com> Commit-Queue: Jakub StaroĊ <jstaron@google.com> Reviewed-by: Stephen Barber <smbarber@chromium.org>
| -rw-r--r-- | devices/src/serial.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/devices/src/serial.rs b/devices/src/serial.rs index fb0886f..0bf5642 100644 --- a/devices/src/serial.rs +++ b/devices/src/serial.rs @@ -110,11 +110,11 @@ impl FromStr for SerialType { type Err = Error; fn from_str(s: &str) -> std::result::Result<Self, Self::Err> { match s { - "file" | "File" => return Ok(SerialType::File), - "stdout" | "Stdout" => return Ok(SerialType::Stdout), - "sink" | "Sink" => return Ok(SerialType::Sink), - "syslog" | "Syslog" => return Ok(SerialType::Syslog), - "unix" | "UnixSocket" => return Ok(SerialType::UnixSocket), + "file" | "File" => Ok(SerialType::File), + "stdout" | "Stdout" => Ok(SerialType::Stdout), + "sink" | "Sink" => Ok(SerialType::Sink), + "syslog" | "Syslog" => Ok(SerialType::Syslog), + "unix" | "UnixSocket" => Ok(SerialType::UnixSocket), _ => Err(Error::InvalidSerialType(s.to_string())), } } @@ -154,7 +154,7 @@ impl SerialParameters { None => Err(Error::PathRequired), Some(path) => Ok(Serial::new_out( evt_fd.try_clone().map_err(Error::CloneEventFd)?, - Box::new(File::create(path.as_path()).map_err(|e| Error::FileError(e))?), + Box::new(File::create(path.as_path()).map_err(Error::FileError)?), )), }, SerialType::UnixSocket => Err(Error::Unimplemented(SerialType::UnixSocket)), |