From b0487d4f9feb7c39ad2b38375e05680a86a43b44 Mon Sep 17 00:00:00 2001 From: Wolfgang Bumiller Date: Fri, 5 Jun 2020 15:08:32 +0200 Subject: [PATCH] formatting fixups Signed-off-by: Wolfgang Bumiller --- src/accessor/mod.rs | 8 ++++++-- src/encoder/aio.rs | 2 +- src/encoder/mod.rs | 35 +++++++++++++++++------------------ src/encoder/sync.rs | 7 +++++-- 4 files changed, 29 insertions(+), 23 deletions(-) diff --git a/src/accessor/mod.rs b/src/accessor/mod.rs index aa27879..28a4ab9 100644 --- a/src/accessor/mod.rs +++ b/src/accessor/mod.rs @@ -230,7 +230,8 @@ impl AccessorImpl { self.input.clone(), link.offset..self.size, PathBuf::from(link.as_os_str()), - ).await?; + ) + .await?; let entry = decoder .next() .await @@ -239,7 +240,10 @@ impl AccessorImpl { EntryKind::File { offset: None, .. } => { io_bail!("failed to follow hardlink, reader provided no offsets"); } - EntryKind::File { offset: Some(offset), size } => { + EntryKind::File { + offset: Some(offset), + size, + } => { let meta_size = offset - link.offset; let entry_end = link.offset + meta_size + size; Ok(FileEntryImpl { diff --git a/src/encoder/aio.rs b/src/encoder/aio.rs index 75568cf..ab20a4a 100644 --- a/src/encoder/aio.rs +++ b/src/encoder/aio.rs @@ -5,7 +5,7 @@ use std::path::Path; use std::pin::Pin; use std::task::{Context, Poll}; -use crate::encoder::{self, SeqWrite, LinkOffset}; +use crate::encoder::{self, LinkOffset, SeqWrite}; use crate::format; use crate::Metadata; diff --git a/src/encoder/mod.rs b/src/encoder/mod.rs index d05a860..73ee887 100644 --- a/src/encoder/mod.rs +++ b/src/encoder/mod.rs @@ -349,12 +349,13 @@ impl<'a, T: SeqWrite + 'a> EncoderImpl<'a, T> { file_name: &Path, target: &Path, ) -> io::Result<()> { - let _ofs: LinkOffset = self.add_file_entry( - Some(metadata), - file_name, - Some((format::PXAR_SYMLINK, target.as_os_str().as_bytes())), - ) - .await?; + let _ofs: LinkOffset = self + .add_file_entry( + Some(metadata), + file_name, + Some((format::PXAR_SYMLINK, target.as_os_str().as_bytes())), + ) + .await?; Ok(()) } @@ -375,12 +376,9 @@ impl<'a, T: SeqWrite + 'a> EncoderImpl<'a, T> { size_of::(), ) }; - let _this_offset: LinkOffset = self.add_file_entry( - None, - file_name, - Some((format::PXAR_HARDLINK, hardlink)), - ) - .await?; + let _this_offset: LinkOffset = self + .add_file_entry(None, file_name, Some((format::PXAR_HARDLINK, hardlink))) + .await?; Ok(()) } @@ -402,12 +400,13 @@ impl<'a, T: SeqWrite + 'a> EncoderImpl<'a, T> { size_of::(), ) }; - let _ofs: LinkOffset = self.add_file_entry( - Some(metadata), - file_name, - Some((format::PXAR_DEVICE, device)), - ) - .await?; + let _ofs: LinkOffset = self + .add_file_entry( + Some(metadata), + file_name, + Some((format::PXAR_DEVICE, device)), + ) + .await?; Ok(()) } diff --git a/src/encoder/sync.rs b/src/encoder/sync.rs index 5d3696f..c8a8ad7 100644 --- a/src/encoder/sync.rs +++ b/src/encoder/sync.rs @@ -6,7 +6,7 @@ use std::pin::Pin; use std::task::{Context, Poll}; use crate::decoder::sync::StandardReader; -use crate::encoder::{self, SeqWrite, LinkOffset}; +use crate::encoder::{self, LinkOffset, SeqWrite}; use crate::format; use crate::util::poll_result_once; use crate::Metadata; @@ -133,7 +133,10 @@ impl<'a, T: SeqWrite + 'a> Encoder<'a, T> { target: PT, offset: LinkOffset, ) -> io::Result<()> { - poll_result_once(self.inner.add_hardlink(file_name.as_ref(), target.as_ref(), offset)) + poll_result_once( + self.inner + .add_hardlink(file_name.as_ref(), target.as_ref(), offset), + ) } /// Add a device node to the archive. -- 2.39.5