extern/starship
1
0
Fork 0
mirror of https://github.com/starship/starship.git synced 2024-12-25 00:28:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

perf: refactor git status to use HashMap for counts (#938)

Browse Source
This commit is contained in:
Onielfa 2020-02-15 02:38:25 +01:00 committed by GitHub
parent ed04c61704
commit ddd8cfb388
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/modules/git_status.rs
View File

@ -5,6 +5,7 @@ use super::{Context, Module, RootModuleConfig};
use crate::config::SegmentConfig; use crate::config::SegmentConfig;
use crate::configs::git_status::{CountConfig, GitStatusConfig}; use crate::configs::git_status::{CountConfig, GitStatusConfig};
use std::borrow::BorrowMut; use std::borrow::BorrowMut;
use std::collections::HashMap;
/// Creates a module with the Git branch in the current directory /// Creates a module with the Git branch in the current directory
/// ///
@ -210,19 +211,41 @@ fn get_repo_status(repository: &mut Repository) -> Result<RepoStatus, git2::Erro
return Err(git2::Error::from_str("Repo has no status")); return Err(git2::Error::from_str("Repo has no status"));
} }
let statuses_count = count_statuses(statuses);
let repo_status: RepoStatus = RepoStatus { let repo_status: RepoStatus = RepoStatus {
conflicted: statuses.iter().filter(|s| is_conflicted(**s)).count(), conflicted: *statuses_count.get("conflicted").unwrap_or(&0),
deleted: statuses.iter().filter(|s| is_deleted(**s)).count(), deleted: *statuses_count.get("deleted").unwrap_or(&0),
renamed: statuses.iter().filter(|s| is_renamed(**s)).count(), renamed: *statuses_count.get("renamed").unwrap_or(&0),
modified: statuses.iter().filter(|s| is_modified(**s)).count(), modified: *statuses_count.get("modified").unwrap_or(&0),
staged: statuses.iter().filter(|s| is_staged(**s)).count(), staged: *statuses_count.get("staged").unwrap_or(&0),
untracked: statuses.iter().filter(|s| is_untracked(**s)).count(), untracked: *statuses_count.get("untracked").unwrap_or(&0),
stashed: stashed_count(repository)?, stashed: stashed_count(repository)?,
}; };
Ok(repo_status) Ok(repo_status)
} }
fn count_statuses(statuses: Vec<Status>) -> HashMap<&'static str, usize> {
let mut predicates: HashMap<&'static str, fn(git2::Status) -> bool> = HashMap::new();
predicates.insert("conflicted", is_conflicted);
predicates.insert("deleted", is_deleted);
predicates.insert("renamed", is_renamed);
predicates.insert("modified", is_modified);
predicates.insert("staged", is_staged);
predicates.insert("untracked", is_untracked);
statuses.iter().fold(HashMap::new(), |mut map, status| {
for (key, predicate) in predicates.iter() {
if predicate(*status) {
let entry = map.entry(key).or_insert(0);
*entry += 1;
}
}
map
})
}
fn is_conflicted(status: Status) -> bool { fn is_conflicted(status: Status) -> bool {
status.is_conflicted() status.is_conflicted()
} }