From 91f411439a7c5fb26ee2a849edd2b08205261da6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vin=C3=ADcius=20Rodrigues=20Miguel?= Date: Sat, 27 Mar 2021 01:34:43 -0300 Subject: [PATCH] rustfmt --- src/compressors/tar.rs | 3 +-- src/compressors/zip.rs | 8 +++++--- src/error.rs | 2 +- src/utils.rs | 27 ++++++++++++++++++++------- 4 files changed, 27 insertions(+), 13 deletions(-) diff --git a/src/compressors/tar.rs b/src/compressors/tar.rs index 2ca322d..d7a014b 100644 --- a/src/compressors/tar.rs +++ b/src/compressors/tar.rs @@ -5,8 +5,8 @@ use tar::Builder; use walkdir::WalkDir; use super::compressor::Entry; -use crate::{compressors::Compressor, file::File}; use crate::utils; +use crate::{compressors::Compressor, file::File}; pub struct TarCompressor {} @@ -21,7 +21,6 @@ impl TarCompressor { } fn make_archive_from_files(input_filenames: Vec) -> crate::Result> { - let buf = Vec::new(); let mut b = Builder::new(buf); diff --git a/src/compressors/zip.rs b/src/compressors/zip.rs index 377ef7f..21d3c9b 100644 --- a/src/compressors/zip.rs +++ b/src/compressors/zip.rs @@ -1,4 +1,7 @@ -use std::{io::{Cursor, Write}, path::PathBuf}; +use std::{ + io::{Cursor, Write}, + path::PathBuf, +}; use walkdir::WalkDir; @@ -52,11 +55,10 @@ impl ZipCompressor { zip::write::FileOptions::default().compression_method(zip::CompressionMethod::Deflated); for filename in input_filenames { - let previous_location = utils::change_dir_and_return_parent(&filename)?; let filename = filename .file_name() - // Safe unwrap since the function call above would fail in scenarios + // Safe unwrap since the function call above would fail in scenarios // where this unwrap would panic .unwrap(); diff --git a/src/error.rs b/src/error.rs index 152f052..6680600 100644 --- a/src/error.rs +++ b/src/error.rs @@ -73,4 +73,4 @@ impl From for Error { eprintln!("{}: {}", "error".red(), err); Self::InvalidInput } -} \ No newline at end of file +} diff --git a/src/utils.rs b/src/utils.rs index 7ed0881..60bdb2c 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -1,4 +1,7 @@ -use std::{env, fs, path::{Path, PathBuf}}; +use std::{ + env, fs, + path::{Path, PathBuf}, +}; use colored::Colorize; @@ -61,19 +64,29 @@ pub(crate) fn get_destination_path(dest: &Option) -> &Path { } } -pub (crate) fn change_dir_and_return_parent(filename: &PathBuf) -> crate::Result { +pub(crate) fn change_dir_and_return_parent(filename: &PathBuf) -> crate::Result { let previous_location = env::current_dir()?; - + let parent = if let Some(parent) = filename.parent() { parent } else { let spacing = " "; - println!("{} It seems you're trying to compress the root folder.", "[WARNING]".red()); - println!("{}This is unadvisable since ouch does compressions in-memory.", spacing); - println!("{}Use a more appropriate tool for this, such as {}.", spacing, "rsync".green()); + println!( + "{} It seems you're trying to compress the root folder.", + "[WARNING]".red() + ); + println!( + "{}This is unadvisable since ouch does compressions in-memory.", + spacing + ); + println!( + "{}Use a more appropriate tool for this, such as {}.", + spacing, + "rsync".green() + ); return Err(crate::Error::InvalidInput); }; env::set_current_dir(parent)?; Ok(previous_location) -} \ No newline at end of file +}