From fb81f26ff5ef89a1a2cab52d463c97e149fb9806 Mon Sep 17 00:00:00 2001 From: Lynnesbian Date: Sat, 28 Aug 2021 17:59:04 +1000 Subject: [PATCH] cargo fmt --- src/files.rs | 14 +++++++------- src/lib.rs | 10 +++++----- src/main.rs | 9 ++++----- src/tests/mod.rs | 7 ++----- 4 files changed, 18 insertions(+), 22 deletions(-) diff --git a/src/files.rs b/src/files.rs index b409076..3f484f6 100644 --- a/src/files.rs +++ b/src/files.rs @@ -1,12 +1,12 @@ -use log::{debug, error}; -use cfg_if::cfg_if; -use walkdir::{DirEntry, WalkDir}; -use std::collections::BTreeSet; -use crate::parameters::ScanOpts; -use mime_guess::from_ext; use crate::findings::{Findings, ScanError}; +use crate::parameters::ScanOpts; use crate::{inspectors, MIMEDB}; +use cfg_if::cfg_if; +use log::{debug, error}; +use mime_guess::from_ext; +use std::collections::BTreeSet; use std::path::Path; +use walkdir::{DirEntry, WalkDir}; cfg_if! { if #[cfg(windows)] { @@ -195,4 +195,4 @@ pub fn scan_directory( } else { Some(entries) } -} \ No newline at end of file +} diff --git a/src/lib.rs b/src/lib.rs index 99bbaea..5f0f56d 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,19 +1,19 @@ #![forbid(unsafe_code)] #![warn(trivial_casts, unused_lifetimes, unused_qualifications)] -pub mod mime_db; +pub mod files; pub mod findings; pub mod formats; pub mod inspectors; +pub mod mime_db; pub mod parameters; pub mod string_type; pub mod utils; -pub mod files; -use cfg_if::cfg_if; -use once_cell::sync::OnceCell; use crate::findings::Findings; use crate::mime_db::MimeDb; +use cfg_if::cfg_if; +use once_cell::sync::OnceCell; cfg_if! { if #[cfg(any(all(unix, feature = "infer-backend"), all(not(unix), not(feature = "xdg-mime-backend"))))] { @@ -40,4 +40,4 @@ pub fn init_db() { .unwrap(); } } -} \ No newline at end of file +} diff --git a/src/main.rs b/src/main.rs index 9d4b30c..07d5aaa 100644 --- a/src/main.rs +++ b/src/main.rs @@ -23,11 +23,11 @@ use std::process::exit; use clap::Clap; use log::{debug, error, info, trace, warn, Level}; -use fif::formats::Format; -use fif::parameters::{OutputFormat}; -use fif::utils::{clap_long_version, os_name}; -use fif::{init_db, parameters, formats}; use fif::files::{scan_directory, scan_from_walkdir}; +use fif::formats::Format; +use fif::parameters::OutputFormat; +use fif::utils::{clap_long_version, os_name}; +use fif::{formats, init_db, parameters}; #[cfg(test)] mod tests; @@ -142,4 +142,3 @@ fn main() { debug!("Done"); } - diff --git a/src/tests/mod.rs b/src/tests/mod.rs index 1b9cc01..c3da0df 100644 --- a/src/tests/mod.rs +++ b/src/tests/mod.rs @@ -1,9 +1,9 @@ +use fif::files::{scan_directory, scan_from_walkdir}; use fif::findings::Findings; use fif::formats::{Format, PowerShell, Shell}; use fif::inspectors::{mime_extension_lookup, BUF_SIZE}; use fif::mime_db::MimeDb; use fif::string_type::String; -use fif::files::{scan_directory, scan_from_walkdir}; use crate::parameters::Parameters; use clap::Clap; @@ -333,10 +333,7 @@ fn identify_random_bytes() { for (mime, count) in &results { println!("{}:\t{} counts", mime, count); } - println!( - "No type found:\t{} counts", - 1000 - results.values().sum::() - ); + println!("No type found:\t{} counts", 1000 - results.values().sum::()); } #[test]