Browse Source

cargo fmt, rearranging use statements

by setting `group_imports = "StdExternalCrate"` in `rustfmt.toml`, cargo fmt/rustfmt rearranges your use statements into three groups:
- std/core/alloc,
- followed by external crates,
- followed by self/super/crate
master
Lynne Megido 2 months ago
parent
commit
8a7cbca461
Signed by: lynnesbian
GPG Key ID: F0A184B5213D9F90
  1. 3
      rustfmt.toml
  2. 10
      src/files.rs
  3. 7
      src/findings.rs
  4. 6
      src/lib.rs
  5. 3
      src/main.rs
  6. 10
      src/parameters.rs
  7. 22
      src/tests/mod.rs

3
rustfmt.toml

@ -2,4 +2,5 @@ max_width = 120
fn_single_line = true
hard_tabs = true
tab_spaces = 2
newline_style = "Unix"
newline_style = "Unix"
group_imports = "StdExternalCrate"

10
src/files.rs

@ -1,8 +1,3 @@
use crate::findings::{Findings, ScanError};
use crate::mime_db::MimeDb;
use crate::parameters::ScanOpts;
use crate::{String, MIMEDB};
use std::collections::BTreeSet;
use std::fs::File;
use std::io;
@ -17,6 +12,11 @@ use mime::Mime;
use mime_guess::from_ext;
use walkdir::{DirEntry, WalkDir};
use crate::findings::{Findings, ScanError};
use crate::mime_db::MimeDb;
use crate::parameters::ScanOpts;
use crate::{String, MIMEDB};
cfg_if! {
if #[cfg(windows)] {
/// Determines whether or not a file is hidden by checking its win32 file attributes.

7
src/findings.rs

@ -1,14 +1,13 @@
use std::fmt::{Display, Formatter};
use std::path::{Path, PathBuf};
use mime::Mime;
#[cfg(feature = "json")]
use serde::{ser::SerializeStruct, Serializer};
use crate::files::mime_extension_lookup;
use crate::String;
#[cfg(feature = "json")]
use serde::{ser::SerializeStruct, Serializer};
use std::fmt::{Display, Formatter};
/// Information about a scanned file.
#[derive(Ord, PartialOrd, Eq, PartialEq)]
pub struct Findings {

6
src/lib.rs

@ -8,12 +8,12 @@ pub mod mime_db;
pub mod parameters;
pub mod utils;
use crate::findings::Findings;
use crate::mime_db::MimeDb;
use cfg_if::cfg_if;
use once_cell::sync::OnceCell;
use crate::findings::Findings;
use crate::mime_db::MimeDb;
cfg_if! {
if #[cfg(not(all(target_endian = "big", target_pointer_width = "32")))] {
// most architectures

3
src/main.rs

@ -21,13 +21,12 @@ use std::io::{stdout, BufWriter, Write};
use std::process::exit;
use clap::Clap;
use log::{debug, error, info, trace, warn, Level};
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};
use log::{debug, error, info, trace, warn, Level};
#[cfg(test)]
mod tests;

10
src/parameters.rs

@ -1,12 +1,14 @@
//! [Clap] struct used to parse command line arguments.
use crate::utils::{clap_long_version, clap_version};
use crate::String as StringType;
use cfg_if::cfg_if;
use clap::{AppSettings, Clap};
use std::collections::BTreeSet;
use std::path::PathBuf;
use cfg_if::cfg_if;
use clap::{AppSettings, Clap};
use crate::utils::{clap_long_version, clap_version};
use crate::String as StringType;
cfg_if! {
if #[cfg(windows)] {
const DEFAULT_FORMAT: &str = "powershell";

22
src/tests/mod.rs

@ -1,18 +1,18 @@
use std::collections::HashMap;
use std::ffi::OsStr;
use std::path::{Path, PathBuf};
use clap::Clap;
use fif::files::{mime_extension_lookup, BUF_SIZE};
use fif::files::{scan_directory, scan_from_walkdir};
use fif::findings::Findings;
use fif::formats::{Format, PowerShell, Shell};
use fif::mime_db::MimeDb;
use fif::String;
use crate::parameters::Parameters;
use clap::Clap;
use mime::{Mime, APPLICATION_OCTET_STREAM, APPLICATION_PDF, IMAGE_JPEG, IMAGE_PNG};
use crate::parameters::ExtensionSet;
use std::collections::HashMap;
use std::ffi::OsStr;
use std::path::{Path, PathBuf};
use crate::parameters::Parameters;
const JPEG_BYTES: &[u8] = b"\xFF\xD8\xFF";
const PNG_BYTES: &[u8] = b"\x89\x50\x4E\x47\x0D\x0A\x1A\x0A";
@ -84,13 +84,15 @@ fn recommend_ext() {
/// Create a simple directory with some files, run `scan_directory` on it, and ensure that the files have their
/// associated mime types correctly deduced.
fn simple_directory() {
use crate::parameters::ScanOpts;
use std::borrow::Borrow;
use std::env::set_current_dir;
use std::fs::{canonicalize, File};
use std::io::Write;
use tempfile::tempdir;
use crate::parameters::ScanOpts;
// set of files to scan. all but the last files have magic numbers corresponding to their extension, except for
// "wrong.jpg", which is actually a png.
let mut files = HashMap::new();
@ -379,8 +381,9 @@ fn outputs_move_commands() {
#[cfg(feature = "json")]
/// Ensure JSON output is valid.
fn test_json() {
use crate::formats::Json;
use std::io::Read;
use crate::formats::Json;
// create an example finding stating that "misnamed_file.png" has been identified as a jpeg file
let entries = vec![Ok(Findings {
file: Path::new("misnamed_file.png").to_path_buf(),
@ -466,8 +469,9 @@ fn verbosity() {
#[test]
/// Ensures that smart strings don't deviate from std's Strings
fn validate_string_type() {
use fif::String as SmartString;
use std::string::String as StdString;
use fif::String as SmartString;
assert_eq!(SmartString::new(), StdString::new());
assert_eq!(SmartString::from("smol"), StdString::from("smol"));
assert_eq!(

Loading…
Cancel
Save