diff options
author | Dylan Reid <dgreid@chromium.org> | 2019-03-07 14:53:39 -0800 |
---|---|---|
committer | chrome-bot <chrome-bot@chromium.org> | 2019-03-26 17:26:57 -0700 |
commit | 31c79375dab565f6589362f179dae3e034ba3575 (patch) | |
tree | 882ddcdfcadeb7352b507add015de51aa16dc91f /sys_util/src/write_zeroes.rs | |
parent | 6a6a36022b4c7e2977efbc2611065310da2b5d60 (diff) | |
download | crosvm-31c79375dab565f6589362f179dae3e034ba3575.tar crosvm-31c79375dab565f6589362f179dae3e034ba3575.tar.gz crosvm-31c79375dab565f6589362f179dae3e034ba3575.tar.bz2 crosvm-31c79375dab565f6589362f179dae3e034ba3575.tar.lz crosvm-31c79375dab565f6589362f179dae3e034ba3575.tar.xz crosvm-31c79375dab565f6589362f179dae3e034ba3575.tar.zst crosvm-31c79375dab565f6589362f179dae3e034ba3575.zip |
sys_util: write_zeros: Make clippy clean
favor `if let` over `match` for destructing a single value. Signed-off-by: Dylan Reid <dgreid@chromium.org> Change-Id: I0c09d7ffc380e84d7413d6fed338d65a60563a8f Reviewed-on: https://chromium-review.googlesource.com/1510069 Tested-by: kokoro <noreply+kokoro@google.com> Reviewed-by: Stephen Barber <smbarber@chromium.org> Reviewed-by: Daniel Verkamp <dverkamp@chromium.org>
Diffstat (limited to 'sys_util/src/write_zeroes.rs')
-rw-r--r-- | sys_util/src/write_zeroes.rs | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/sys_util/src/write_zeroes.rs b/sys_util/src/write_zeroes.rs index 07769e8..8c7f775 100644 --- a/sys_util/src/write_zeroes.rs +++ b/sys_util/src/write_zeroes.rs @@ -32,15 +32,14 @@ impl<T: PunchHole + Seek + Write> WriteZeroes for T { fn write_zeroes(&mut self, length: usize) -> io::Result<usize> { // Try to punch a hole first. let offset = self.seek(SeekFrom::Current(0))?; - match self.punch_hole(offset, length as u64) { - Ok(()) => { - // Advance the seek cursor as if we had done a real write(). - self.seek(SeekFrom::Current(length as i64))?; - return Ok(length); - } - Err(_) => {} // fall back to write() + if let Ok(()) = self.punch_hole(offset, length as u64) { + // Advance the seek cursor as if we had done a real write(). + self.seek(SeekFrom::Current(length as i64))?; + return Ok(length); } + // fall back to write() + // punch_hole() failed; fall back to writing a buffer of zeroes // until we have written up to length. let buf_size = min(length, 0x10000); |