Clean up include order

This commit is contained in:
sharkdp 2020-04-03 21:24:11 +02:00 committed by David Peter
parent f9372b55d5
commit 53557ef471
5 changed files with 15 additions and 18 deletions

View File

@ -1,8 +1,9 @@
use clap::Shell;
use std::fs; use std::fs;
use std::io::{self, Write}; use std::io::{self, Write};
use std::process::exit; use std::process::exit;
use clap::Shell;
include!("src/app.rs"); include!("src/app.rs");
fn main() { fn main() {

View File

@ -1,7 +1,5 @@
#[macro_use]
mod error;
mod app; mod app;
mod error;
mod exec; mod exec;
mod exit_codes; mod exit_codes;
mod filesystem; mod filesystem;

View File

@ -1,9 +1,11 @@
use std::{path::PathBuf, sync::Arc, time::Duration};
use lscolors::LsColors;
use regex::bytes::RegexSet;
use crate::exec::CommandTemplate; use crate::exec::CommandTemplate;
use crate::filetypes::FileTypes; use crate::filetypes::FileTypes;
use crate::filter::{SizeFilter, TimeFilter}; use crate::filter::{SizeFilter, TimeFilter};
use lscolors::LsColors;
use regex::bytes::RegexSet;
use std::{path::PathBuf, sync::Arc, time::Duration};
/// Configuration options for *fd*. /// Configuration options for *fd*.
pub struct Options { pub struct Options {

View File

@ -1,16 +1,12 @@
use std;
use std::env; use std::env;
use std::fs; use std::fs;
use std::io; use std::io::{self, Write};
use std::io::Write;
use std::path::{Path, PathBuf};
use std::process;
#[cfg(unix)] #[cfg(unix)]
use std::os::unix; use std::os::unix;
#[cfg(windows)] #[cfg(windows)]
use std::os::windows; use std::os::windows;
use std::path::{Path, PathBuf};
use std::process;
use tempdir::TempDir; use tempdir::TempDir;

View File

@ -1,14 +1,14 @@
//! Integration tests for the CLI interface of fd.
mod testenv; mod testenv;
use crate::testenv::TestEnv;
use regex::escape;
use std::fs; use std::fs;
use std::io::Write; use std::io::Write;
use std::path::Path; use std::path::Path;
use std::time::{Duration, SystemTime}; use std::time::{Duration, SystemTime};
use regex::escape;
use crate::testenv::TestEnv;
static DEFAULT_DIRS: &'static [&'static str] = &["one/two/three", "one/two/three/directory_foo"]; static DEFAULT_DIRS: &'static [&'static str] = &["one/two/three", "one/two/three/directory_foo"];
static DEFAULT_FILES: &'static [&'static str] = &[ static DEFAULT_FILES: &'static [&'static str] = &[