]> git.proxmox.com Git - pxar.git/commitdiff
formatting fixups
authorWolfgang Bumiller <w.bumiller@proxmox.com>
Fri, 5 Jun 2020 13:08:32 +0000 (15:08 +0200)
committerWolfgang Bumiller <w.bumiller@proxmox.com>
Fri, 5 Jun 2020 13:08:32 +0000 (15:08 +0200)
Signed-off-by: Wolfgang Bumiller <w.bumiller@proxmox.com>
src/accessor/mod.rs
src/encoder/aio.rs
src/encoder/mod.rs
src/encoder/sync.rs

index aa27879715248715117aac7b951b21d0473b28b1..28a4ab9970bdefb7ceb67c8cdf5cbe26ef0d4feb 100644 (file)
@@ -230,7 +230,8 @@ impl<T: Clone + ReadAt> AccessorImpl<T> {
             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<T: Clone + ReadAt> AccessorImpl<T> {
             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 {
index 75568cf6c2dc81e0990d2236a605339efed15601..ab20a4a5cec7818c410eec1d3af209c50e4e4397 100644 (file)
@@ -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;
 
index d05a860b0bf5c2e012dac0dd442d4516774d775d..73ee887b219981b392426c02f1dd5f71b9d1dd40 100644 (file)
@@ -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::<format::Hardlink>(),
             )
         };
-        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::<format::Device>(),
             )
         };
-        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(())
     }
 
index 5d3696ffc0e30103447a08883c3051468d4fd809..c8a8ad751b672d8b43364230b1b0baf312860bfb 100644 (file)
@@ -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.