diff --git a/rust-toolchain b/rust-toolchain new file mode 100644 index 0000000..bf867e0 --- /dev/null +++ b/rust-toolchain @@ -0,0 +1 @@ +nightly diff --git a/rustfmt.toml b/rustfmt.toml index 7bba11e..2ac63bb 100644 --- a/rustfmt.toml +++ b/rustfmt.toml @@ -6,3 +6,5 @@ reorder_imports = true reorder_modules = true use_try_shorthand = true use_small_heuristics = "Max" +unstable_features = true +force_multiline_blocks = true diff --git a/src/error.rs b/src/error.rs index 62a6b55..571507e 100644 --- a/src/error.rs +++ b/src/error.rs @@ -103,31 +103,39 @@ impl fmt::Display for Error { .detail("This is unadvisable since ouch does compressions in-memory.") .hint("Use a more appropriate tool for this, such as rsync.") } - Error::MissingArgumentsForCompression => FinalError::with_title("Could not compress") - .detail("The compress command requires at least 2 arguments") - .hint("You must provide:") - .hint(" - At least one input argument.") - .hint(" - The output argument.") - .hint("") - .hint("Example: `ouch compress image.png img.zip`"), - Error::MissingArgumentsForDecompression => FinalError::with_title("Could not decompress") - .detail("The compress command requires at least one argument") - .hint("You must provide:") - .hint(" - At least one input argument.") - .hint("") - .hint("Example: `ouch decompress imgs.tar.gz`"), - Error::InternalError => FinalError::with_title("InternalError :(") - .detail("This should not have happened") - .detail("It's probably our fault") - .detail("Please help us improve by reporting the issue at:") - .detail(format!(" {}https://github.com/vrmiguel/ouch/issues ", cyan())), + Error::MissingArgumentsForCompression => { + FinalError::with_title("Could not compress") + .detail("The compress command requires at least 2 arguments") + .hint("You must provide:") + .hint(" - At least one input argument.") + .hint(" - The output argument.") + .hint("") + .hint("Example: `ouch compress image.png img.zip`") + } + Error::MissingArgumentsForDecompression => { + FinalError::with_title("Could not decompress") + .detail("The compress command requires at least one argument") + .hint("You must provide:") + .hint(" - At least one input argument.") + .hint("") + .hint("Example: `ouch decompress imgs.tar.gz`") + } + Error::InternalError => { + FinalError::with_title("InternalError :(") + .detail("This should not have happened") + .detail("It's probably our fault") + .detail("Please help us improve by reporting the issue at:") + .detail(format!(" {}https://github.com/vrmiguel/ouch/issues ", cyan())) + } Error::OofError(err) => FinalError::with_title(err), Error::IoError { reason } => FinalError::with_title(reason), - Error::CompressionTypo => FinalError::with_title("Possible typo detected").hint(format!( - "Did you mean '{}ouch compress{}'?", - magenta(), - reset() - )), + Error::CompressionTypo => { + FinalError::with_title("Possible typo detected").hint(format!( + "Did you mean '{}ouch compress{}'?", + magenta(), + reset() + )) + } Error::UnknownExtensionError(_) => todo!(), Error::AlreadyExists => todo!(), Error::InvalidZipArchive(_) => todo!(), diff --git a/src/oof/error.rs b/src/oof/error.rs index 6dd4783..299601a 100644 --- a/src/oof/error.rs +++ b/src/oof/error.rs @@ -31,18 +31,22 @@ impl fmt::Display for OofError { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { // TODO: implement proper debug messages match self { - OofError::FlagValueConflict { flag, previous_value, new_value } => write!( - f, - "CLI flag value conflicted for flag '--{}', previous: {:?}, new: {:?}.", - flag.long, previous_value, new_value - ), + OofError::FlagValueConflict { flag, previous_value, new_value } => { + write!( + f, + "CLI flag value conflicted for flag '--{}', previous: {:?}, new: {:?}.", + flag.long, previous_value, new_value + ) + } OofError::InvalidUnicode(flag) => write!(f, "{:?} is not valid Unicode.", flag), OofError::UnknownShortFlag(ch) => write!(f, "Unknown argument '-{}'", ch), - OofError::MisplacedShortArgFlagError(ch) => write!( - f, - "Invalid placement of `-{}`.\nOnly the last letter in a sequence of short flags can take values.", - ch - ), + OofError::MisplacedShortArgFlagError(ch) => { + write!( + f, + "Invalid placement of `-{}`.\nOnly the last letter in a sequence of short flags can take values.", + ch + ) + } OofError::MissingValueToFlag(flag) => write!(f, "Flag {} takes value but none was supplied.", flag), OofError::DuplicatedFlag(flag) => write!(f, "Duplicated usage of {}.", flag), OofError::UnknownLongFlag(flag) => write!(f, "Unknown argument '--{}'", flag),