Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolve clippy warnings #1201

Merged
merged 2 commits into from
Nov 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ mod test {

assert_eq!(
config,
CliOptions::parse_from(&[
CliOptions::parse_from([
"onefetch",
"/tmp/folder",
"--number-of-authors",
Expand All @@ -406,22 +406,22 @@ mod test {

#[test]
fn test_config_with_image_protocol_but_no_image() {
assert!(CliOptions::try_parse_from(&["onefetch", "--image-protocol", "sixel"]).is_err())
assert!(CliOptions::try_parse_from(["onefetch", "--image-protocol", "sixel"]).is_err())
}

#[test]
fn test_config_with_color_resolution_but_no_image() {
assert!(CliOptions::try_parse_from(&["onefetch", "--color-resolution", "32"]).is_err())
assert!(CliOptions::try_parse_from(["onefetch", "--color-resolution", "32"]).is_err())
}

#[test]
fn test_config_with_ascii_colors_but_out_of_bounds() {
assert!(CliOptions::try_parse_from(&["onefetch", "--ascii-colors", "17"]).is_err())
assert!(CliOptions::try_parse_from(["onefetch", "--ascii-colors", "17"]).is_err())
}

#[test]
fn test_config_with_text_colors_but_out_of_bounds() {
assert!(CliOptions::try_parse_from(&["onefetch", "--text-colors", "17"]).is_err())
assert!(CliOptions::try_parse_from(["onefetch", "--text-colors", "17"]).is_err())
}
}

Expand Down
16 changes: 9 additions & 7 deletions src/info/git/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -117,13 +117,15 @@ pub fn traverse_commit_graph(repo: &gix::Repository, options: &CliOptions) -> Re
Ok(git_metrics)
}

type NumberOfCommitsBySignature = HashMap<Sig, usize>;

fn get_author_channel(
repo: &gix::Repository,
num_threads: usize,
bot_regex_pattern: &Option<MyRegex>,
mailmap: &gix::mailmap::Snapshot,
) -> (
Vec<JoinHandle<Result<HashMap<Sig, usize>>>>,
Vec<JoinHandle<Result<NumberOfCommitsBySignature>>>,
crossbeam_channel::Sender<ObjectId>,
) {
// we intentionally over-allocate threads a little as the main thread won't be very busy anyway
Expand All @@ -140,7 +142,7 @@ fn get_author_channel(
let bot_regex_pattern = bot_regex_pattern.clone();
let rx = rx.clone();
move || -> anyhow::Result<_> {
let mut number_of_commits_by_signature: HashMap<Sig, usize> = HashMap::new();
let mut number_of_commits_by_signature = NumberOfCommitsBySignature::new();
// We are sure to see each object only once.
repo.object_cache_size(0);
while let Ok(commit_id) = rx.recv() {
Expand All @@ -160,22 +162,22 @@ fn get_author_channel(
(threads, tx)
}

type NumberOfCommitsByFilepath = HashMap<BString, usize>;
type ChurnPair = (NumberOfCommitsByFilepath, usize);

fn get_churn_channel(
repo: &gix::Repository,
has_commit_graph_traversal_ended: &Arc<AtomicBool>,
total_number_of_commits: &Arc<AtomicUsize>,
churn_pool_size_opt: Option<usize>,
) -> Result<(
JoinHandle<Result<(HashMap<BString, usize>, usize)>>,
Sender<ObjectId>,
)> {
) -> Result<(JoinHandle<Result<ChurnPair>>, Sender<ObjectId>)> {
let (tx, rx) = channel::<gix::hash::ObjectId>();
let thread = std::thread::spawn({
let repo = repo.clone();
let has_commit_graph_traversal_ended = has_commit_graph_traversal_ended.clone();
let total_number_of_commits = total_number_of_commits.clone();
move || -> Result<_> {
let mut number_of_commits_by_file_path: HashMap<BString, usize> = HashMap::new();
let mut number_of_commits_by_file_path = NumberOfCommitsByFilepath::new();
let mut number_of_diffs_computed = 0;
while let Ok(commit_id) = rx.recv() {
let commit = repo.find_object(commit_id)?.into_commit();
Expand Down