From dc2ac7b002a57c18a0a740be217bfba5c265e526 Mon Sep 17 00:00:00 2001 From: Lynne Date: Tue, 20 Apr 2021 15:20:10 +1000 Subject: [PATCH] reformatting/reordering --- src/findings.rs | 2 +- src/formats.rs | 2 +- src/inspectors.rs | 2 -- src/main.rs | 6 +++--- src/tests/mod.rs | 2 +- 5 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/findings.rs b/src/findings.rs index 5085c3c..a2e4c72 100644 --- a/src/findings.rs +++ b/src/findings.rs @@ -1,9 +1,9 @@ use std::path::Path; -use crate::string_type::String; use mime_guess::Mime; use crate::inspectors::mime_extension_lookup; +use crate::string_type::String; /// Information about a scanned file. pub struct Findings<'a> { diff --git a/src/formats.rs b/src/formats.rs index f08120e..b57cc2f 100644 --- a/src/formats.rs +++ b/src/formats.rs @@ -1,5 +1,6 @@ //! The various formats that [fif](crate) can output to. +use std::ffi::OsStr; use std::io::{self, Write}; #[cfg(unix)] use std::os::unix::ffi::OsStrExt; @@ -9,7 +10,6 @@ use snailquote::escape; use crate::scan_error::ScanError; use crate::{Findings, BACKEND}; -use std::ffi::OsStr; /// The current version of fif, as defined in Cargo.toml. const VERSION: Option<&'static str> = option_env!("CARGO_PKG_VERSION"); diff --git a/src/inspectors.rs b/src/inspectors.rs index 50b78e7..b172728 100644 --- a/src/inspectors.rs +++ b/src/inspectors.rs @@ -91,8 +91,6 @@ cached! { } } - - match exts { Some(exts) => { let possible_exts: Vec = exts.iter().map(|e| String::from(*e)).collect(); diff --git a/src/main.rs b/src/main.rs index 34c27a7..21413e3 100644 --- a/src/main.rs +++ b/src/main.rs @@ -17,11 +17,14 @@ #![forbid(unsafe_code)] #![warn(trivial_casts, unused_lifetimes, unused_qualifications)] +use std::ffi::OsStr; use std::io::{stdout, BufWriter}; use std::path::Path; +use std::process::exit; use cfg_if::cfg_if; use clap::Clap; +use env_logger::Env; use log::{debug, error, info, trace, warn}; use once_cell::sync::OnceCell; #[cfg(feature = "multi-threaded")] @@ -33,9 +36,6 @@ use crate::formats::{Format, PowerShell, Shell}; use crate::mime_db::MimeDb; use crate::parameters::{OutputFormat, ScanOpts}; use crate::scan_error::ScanError; -use env_logger::Env; -use std::ffi::OsStr; -use std::process::exit; mod extension_set; mod findings; diff --git a/src/tests/mod.rs b/src/tests/mod.rs index f1b4ce6..22036bc 100644 --- a/src/tests/mod.rs +++ b/src/tests/mod.rs @@ -192,7 +192,7 @@ fn argument_parsing() { ScanOpts { hidden: false, extensionless: false, - follow_symlinks: true + follow_symlinks: true, }, "ScanOpts are incorrect" )