1
0
mirror of https://github.com/Llewellynvdm/starship.git synced 2024-12-25 11:20:01 +00:00

A bit of tidying up

This commit is contained in:
Matan Kushner 2019-04-07 23:28:38 -04:00
parent 168a6fd7b1
commit 5086ba2f50
No known key found for this signature in database
GPG Key ID: 4B98C3A8949CA8A4
3 changed files with 11 additions and 11 deletions

View File

@ -15,12 +15,11 @@ pub fn segment(args: &ArgMatches) -> Segment {
const COLOR_SUCCESS: Color = Color::Green;
const COLOR_FAILURE: Color = Color::Red;
let color;
if args.value_of("status_code").unwrap() == "0" {
color = COLOR_SUCCESS;
let color = if args.value_of("status_code").unwrap() == "0" {
COLOR_SUCCESS
} else {
color = COLOR_FAILURE;
}
COLOR_FAILURE
};
Segment {
value: String::from(PROMPT_CHAR),

View File

@ -36,7 +36,7 @@ pub fn segment(_: &ArgMatches) -> Segment {
}
Segment {
value: String::from(dir_string),
value: dir_string,
style: Style::from(COLOR_DIR).bold(),
..Default::default()
}
@ -44,11 +44,12 @@ pub fn segment(_: &ArgMatches) -> Segment {
/// Get the root directory of a git repo
fn get_repo_root(repo: Repository) -> PathBuf {
match repo.is_bare() {
// A bare repo will return its root path
true => repo.path().to_path_buf(),
if repo.is_bare() {
// Bare repos will return the repo root
repo.path().to_path_buf()
} else {
// Non-bare repos will return the path of `.git`
false => repo.path().parent().unwrap().to_path_buf(),
repo.path().parent().unwrap().to_path_buf()
}
}

View File

@ -8,7 +8,7 @@ pub fn prompt(args: ArgMatches) {
default_prompt
.into_iter()
.map(|module| modules::handle(module, &args))
.map(|segment| stringify_segment(segment))
.map(stringify_segment)
.for_each(|segment_string| print!("{}", segment_string));
}