Skip to content

Commit

Permalink
remove unnecessary extern crate
Browse files Browse the repository at this point in the history
also did rustfmt, which orders uses alphabetically...
  • Loading branch information
jqnatividad committed Nov 3, 2021
1 parent f9f1f2d commit 1eb0d42
Show file tree
Hide file tree
Showing 37 changed files with 59 additions and 86 deletions.
16 changes: 8 additions & 8 deletions src/cmd/apply.rs
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
use crate::regex::Regex;
use lazy_static::lazy_static;
use regex::Regex;

use crate::chrono::{NaiveTime, Utc};
use crate::config::{Config, Delimiter};
use crate::currency::Currency;
use crate::dateparser::parse_with;
use crate::indicatif::ProgressBar;
use crate::natural::phonetics::soundex;
use crate::reverse_geocoder::{Locations, ReverseGeocoder};
use crate::select::SelectColumns;
use crate::serde::Deserialize;
use crate::util;
use crate::CliResult;
use chrono::{NaiveTime, Utc};
use currency::Currency;
use dateparser::parse_with;
use indicatif::ProgressBar;
use natural::phonetics::soundex;
use reverse_geocoder::{Locations, ReverseGeocoder};
use serde::Deserialize;
use strsim::{
damerau_levenshtein, hamming, jaro_winkler, normalized_damerau_levenshtein, osa_distance,
sorensen_dice,
Expand Down
2 changes: 1 addition & 1 deletion src/cmd/dedup.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use std::str::from_utf8;

use crate::config::{Config, Delimiter};
use crate::select::SelectColumns;
use crate::serde::Deserialize;
use serde::Deserialize;
use crate::util;
use crate::CliResult;

Expand Down
2 changes: 1 addition & 1 deletion src/cmd/enumerate.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use crate::uuid::Uuid;
use uuid::Uuid;

use crate::config::{Config, Delimiter};
use crate::select::SelectColumns;
Expand Down
4 changes: 2 additions & 2 deletions src/cmd/exclude.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ use std::fs;
use std::io;
use std::str;

use crate::byteorder::{BigEndian, WriteBytesExt};
use byteorder::{BigEndian, WriteBytesExt};

use crate::config::{Config, Delimiter};
use crate::index::Indexed;
use crate::select::{SelectColumns, Selection};
use crate::serde::Deserialize;
use serde::Deserialize;
use crate::util;
use crate::CliResult;

Expand Down
2 changes: 1 addition & 1 deletion src/cmd/fill.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ use std::ops;

use crate::config::{Config, Delimiter};
use crate::select::{SelectColumns, Selection};
use crate::serde::Deserialize;
use serde::Deserialize;
use crate::util;
use crate::CliResult;

Expand Down
2 changes: 1 addition & 1 deletion src/cmd/fixlengths.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use std::cmp;

use crate::config::{Config, Delimiter};
use crate::serde::Deserialize;
use serde::Deserialize;
use crate::util;
use crate::CliResult;

Expand Down
2 changes: 1 addition & 1 deletion src/cmd/flatten.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use std::io::{self, Write};
use tabwriter::TabWriter;

use crate::config::{Config, Delimiter};
use crate::serde::Deserialize;
use serde::Deserialize;
use crate::util;
use crate::CliResult;

Expand Down
2 changes: 1 addition & 1 deletion src/cmd/fmt.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
use crate::config::{Config, Delimiter};
use crate::serde::Deserialize;
use serde::Deserialize;
use crate::util;
use crate::CliResult;

Expand Down
4 changes: 2 additions & 2 deletions src/cmd/foreach.rs
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
use crate::regex::bytes::{NoExpand, Regex};
use regex::bytes::{NoExpand, Regex};
#[allow(unused_imports)]
use std::ffi::OsStr;
use std::io::BufReader;
#[cfg(target_family = "unix")]
use std::os::unix::ffi::OsStrExt;
use std::process::{Command, Stdio};

use crate::indicatif::ProgressBar;
use crate::config::{Config, Delimiter};
use crate::select::SelectColumns;
use crate::util;
use crate::CliResult;
use indicatif::ProgressBar;
use serde::Deserialize;

static USAGE: &str = "
Expand Down
2 changes: 1 addition & 1 deletion src/cmd/frequency.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ use threadpool::ThreadPool;
use crate::config::{Config, Delimiter};
use crate::index::Indexed;
use crate::select::{SelectColumns, Selection};
use crate::serde::Deserialize;
use crate::util;
use crate::CliResult;
use serde::Deserialize;

static USAGE: &str = "
Compute a frequency table on CSV data.
Expand Down
2 changes: 1 addition & 1 deletion src/cmd/headers.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ use std::io;
use tabwriter::TabWriter;

use crate::config::Delimiter;
use crate::serde::Deserialize;
use crate::util;
use crate::CliResult;
use serde::Deserialize;

static USAGE: &str = "
Prints the fields of the first row in the CSV data.
Expand Down
2 changes: 1 addition & 1 deletion src/cmd/index.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ use std::path::{Path, PathBuf};
use csv_index::RandomAccessSimple;

use crate::config::{Config, Delimiter};
use crate::serde::Deserialize;
use crate::util;
use crate::CliResult;
use serde::Deserialize;

static USAGE: &str = "
Creates an index of the given CSV data, which can make other operations like
Expand Down
2 changes: 1 addition & 1 deletion src/cmd/input.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use crate::config::{Config, Delimiter};
use crate::serde::Deserialize;
use crate::util;
use crate::CliResult;
use serde::Deserialize;

static USAGE: &str = "
Read CSV data with special quoting rules.
Expand Down
2 changes: 1 addition & 1 deletion src/cmd/join.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ use byteorder::{BigEndian, WriteBytesExt};
use crate::config::{Config, Delimiter, SeekRead};
use crate::index::Indexed;
use crate::select::{SelectColumns, Selection};
use crate::serde::Deserialize;
use crate::util;
use crate::CliResult;
use serde::Deserialize;

static USAGE: &str = "
Joins two sets of CSV data on the specified columns.
Expand Down
2 changes: 1 addition & 1 deletion src/cmd/jsonl.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use crate::serde_json::Value;
use serde_json::Value;
use std::fs;
use std::io::{self, BufRead, BufReader};

Expand Down
4 changes: 2 additions & 2 deletions src/cmd/lua.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@ use std::fs::File;
use std::io::prelude::*;

use crate::config::{Config, Delimiter};
use crate::hlua::{AnyLuaValue, Lua, LuaError, LuaTable};
use crate::indicatif::ProgressBar;
use crate::util;
use crate::CliError;
use crate::CliResult;
use hlua::{AnyLuaValue, Lua, LuaError, LuaTable};
use indicatif::ProgressBar;
use serde::Deserialize;

// TODO: options for boolean return coercion
Expand Down
2 changes: 1 addition & 1 deletion src/cmd/partition.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ use regex::Regex;

use crate::config::{Config, Delimiter};
use crate::select::SelectColumns;
use crate::serde::Deserialize;
use crate::util::{self, FilenameTemplate};
use crate::CliResult;
use serde::Deserialize;

static USAGE: &str = "
Partitions the given CSV data into chunks based on the value of a column
Expand Down
2 changes: 1 addition & 1 deletion src/cmd/pseudo.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ use std::collections::HashMap;

use crate::config::{Config, Delimiter};
use crate::select::SelectColumns;
use crate::serde::Deserialize;
use crate::util;
use crate::CliResult;
use serde::Deserialize;

static USAGE: &str = "
Pseudonymise the value of the given column by replacing them by an
Expand Down
2 changes: 1 addition & 1 deletion src/cmd/rename.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use crate::config::{Config, Delimiter};
use crate::serde::Deserialize;
use crate::util;
use crate::CliResult;
use serde::Deserialize;

static USAGE: &str = "
Rename the columns of CSV data efficiently.
Expand Down
2 changes: 1 addition & 1 deletion src/cmd/replace.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use crate::regex::bytes::RegexBuilder;
use regex::bytes::RegexBuilder;
use std::borrow::Cow;

use crate::config::{Config, Delimiter};
Expand Down
2 changes: 1 addition & 1 deletion src/cmd/reverse.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
use crate::config::{Config, Delimiter};
use crate::serde::Deserialize;
use crate::util;
use crate::CliResult;
use serde::Deserialize;

static USAGE: &str = "
Reverses rows of CSV data.
Expand Down
2 changes: 1 addition & 1 deletion src/cmd/sample.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ use rand::{self, Rng, SeedableRng};

use crate::config::{Config, Delimiter};
use crate::index::Indexed;
use crate::serde::Deserialize;
use crate::util;
use crate::CliResult;
use serde::Deserialize;

static USAGE: &str = "
Randomly samples CSV data uniformly using memory proportional to the size of
Expand Down
6 changes: 2 additions & 4 deletions src/cmd/scramble.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ use rand::seq::SliceRandom;

use crate::config::{Config, Delimiter};
use crate::index::Indexed;
use crate::serde::Deserialize;
use crate::util;
use crate::CliResult;
use serde::Deserialize;

static USAGE: &str = "
Randomly scrambles CSV records uniformly using memory proportional to the size of
Expand Down Expand Up @@ -58,9 +58,7 @@ pub fn run(argv: &[&str]) -> CliResult<()> {
Ok(wtr.flush()?)
}

fn scramble_random_access<R, I>(
idx: &mut Indexed<R, I>,
) -> CliResult<Vec<csv::ByteRecord>>
fn scramble_random_access<R, I>(idx: &mut Indexed<R, I>) -> CliResult<Vec<csv::ByteRecord>>
where
R: io::Read + io::Seek,
I: io::Read + io::Seek,
Expand Down
8 changes: 5 additions & 3 deletions src/cmd/search.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ use regex::bytes::RegexBuilder;

use crate::config::{Config, Delimiter};
use crate::select::SelectColumns;
use crate::serde::Deserialize;
use crate::util;
use crate::CliResult;
use serde::Deserialize;

static USAGE: &str = "
Filters CSV data by whether the given regex matches a row.
Expand Down Expand Up @@ -91,10 +91,12 @@ pub fn run(argv: &[&str]) -> CliResult<()> {

if args.flag_flag.is_some() {
flag_rowi += 1;
record.push_field(if m {
record.push_field(if m {
_matched_rows = flag_rowi.to_string();
_matched_rows.as_bytes()
} else { b"0" });
} else {
b"0"
});
wtr.write_byte_record(&record)?;
} else if m {
wtr.write_byte_record(&record)?;
Expand Down
12 changes: 5 additions & 7 deletions src/cmd/searchset.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ use std::path::Path;

use crate::config::{Config, Delimiter};
use crate::select::SelectColumns;
use crate::serde::Deserialize;
use crate::util;
use crate::CliResult;
use serde::Deserialize;

static USAGE: &str = "
Filters CSV data by whether the given regex set matches a row.
Expand Down Expand Up @@ -70,12 +70,10 @@ struct Args {
fn read_regexset(filename: impl AsRef<Path>) -> io::Result<Vec<String>> {
match File::open(filename) {
Ok(f) => BufReader::new(f).lines().collect(),
Err(_) => {
Err(io::Error::new(
io::ErrorKind::NotFound,
"Cannot open regexset file.",
))
}
Err(_) => Err(io::Error::new(
io::ErrorKind::NotFound,
"Cannot open regexset file.",
)),
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/cmd/select.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use crate::config::{Config, Delimiter};
use crate::select::SelectColumns;
use crate::serde::Deserialize;
use crate::util;
use crate::CliResult;
use serde::Deserialize;

static USAGE: &str = r#"
Select columns from CSV data efficiently.
Expand Down
2 changes: 1 addition & 1 deletion src/cmd/slice.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ use std::fs;

use crate::config::{Config, Delimiter};
use crate::index::Indexed;
use crate::serde::Deserialize;
use crate::util;
use crate::CliResult;
use serde::Deserialize;

static USAGE: &str = "
Returns the rows in the range specified (starting at 0, half-open interval).
Expand Down
2 changes: 1 addition & 1 deletion src/cmd/sort.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ use std::cmp;

use crate::config::{Config, Delimiter};
use crate::select::SelectColumns;
use crate::serde::Deserialize;
use crate::util;
use crate::CliResult;
use serde::Deserialize;
use std::str::from_utf8;

use self::Number::{Float, Int};
Expand Down
2 changes: 1 addition & 1 deletion src/cmd/split.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ use threadpool::ThreadPool;

use crate::config::{Config, Delimiter};
use crate::index::Indexed;
use crate::serde::Deserialize;
use crate::util::{self, FilenameTemplate};
use crate::CliResult;
use serde::Deserialize;

static USAGE: &str = "
Splits the given CSV data into chunks.
Expand Down
4 changes: 2 additions & 2 deletions src/cmd/stats.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ use stats::{merge_all, Commute, MinMax, OnlineStats, Unsorted};
use threadpool::ThreadPool;

use crate::config::{Config, Delimiter};
use crate::dateparser::DateTimeUtc;
use crate::index::Indexed;
use crate::select::{SelectColumns, Selection};
use crate::serde::Deserialize;
use crate::util;
use crate::CliResult;
use dateparser::DateTimeUtc;
use serde::Deserialize;

use self::FieldType::{TDate, TFloat, TInteger, TNull, TUnicode, TUnknown};

Expand Down
2 changes: 1 addition & 1 deletion src/cmd/table.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ use std::convert::From;
use tabwriter::{Alignment, TabWriter};

use crate::config::{Config, Delimiter};
use crate::serde::Deserialize;
use crate::util;
use crate::CliResult;
use serde::Deserialize;

static USAGE: &str = "
Outputs CSV data as a table with columns in alignment.
Expand Down
4 changes: 2 additions & 2 deletions src/cmd/transpose.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use crate::config::{Config, Delimiter};
use crate::csv::ByteRecord;
use crate::serde::Deserialize;
use crate::util;
use crate::CliResult;
use csv::ByteRecord;
use serde::Deserialize;
use std::str;

static USAGE: &str = "
Expand Down
Loading

0 comments on commit 1eb0d42

Please sign in to comment.