From a24e3993e024fbd94dd402f933a340e43dc45ea6 Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Thu, 4 Jul 2019 11:39:10 +0200 Subject: [PATCH] src/backup/chunk_store.rs: coding style fixes --- src/backup/chunk_store.rs | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/src/backup/chunk_store.rs b/src/backup/chunk_store.rs index a0029667..5a3a9dfe 100644 --- a/src/backup/chunk_store.rs +++ b/src/backup/chunk_store.rs @@ -177,8 +177,14 @@ impl ChunkStore { let (chunk_path, digest_str) = self.chunk_path(digest); let mut file = std::fs::File::open(&chunk_path) - .map_err(|err| format_err!( - "store '{}', unable to read chunk '{}' - {}", self.name, digest_str, err))?; + .map_err(|err| { + format_err!( + "store '{}', unable to read chunk '{}' - {}", + self.name, + digest_str, + err, + ) + })?; DataChunk::load(&mut file, *digest) } @@ -193,12 +199,15 @@ impl ChunkStore { use nix::fcntl::OFlag; use nix::sys::stat::Mode; - let base_handle = match Dir::open( - &self.chunk_dir, OFlag::O_RDONLY, Mode::empty()) { - Ok(h) => h, - Err(err) => bail!("unable to open store '{}' chunk dir {:?} - {}", - self.name, self.chunk_dir, err), - }; + let base_handle = Dir::open(&self.chunk_dir, OFlag::O_RDONLY, Mode::empty()) + .map_err(|err| { + format_err!( + "unable to open store '{}' chunk dir {:?} - {}", + self.name, + self.chunk_dir, + err, + ) + })?; let mut done = false; let mut inner: Option = None;