haskal
/
starship
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refactor: read CLI options as `str` (#2656)

This commit is contained in:
Dario Vladović 2021-04-28 20:39:32 +02:00 committed by GitHub
parent 601b499f07
commit 67e0eb0e9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/modules/character.rs
View File

@ -22,10 +22,8 @@ pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> {
let config: CharacterConfig = CharacterConfig::try_load(module.config);
let props = &context.properties;
let exit_code_default = String::from("0");
let exit_code = props.get("status_code").unwrap_or(&exit_code_default);
let keymap_default = String::from("viins");
let keymap = props.get("keymap").unwrap_or(&keymap_default);
let exit_code = props.get("status_code").map(String::as_str).unwrap_or("0");
let keymap = props.get("keymap").map(String::as_str).unwrap_or("viins");
let exit_success = exit_code == "0";
// Match shell "keymap" names to normalized vi modes
@ -33,7 +31,7 @@ pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> {
// Unfortunately, this is also the name of the non-vi default mode.
// We do some environment detection in src/init.rs to translate.
// The result: in non-vi fish, keymap is always reported as "insert"
let mode = match (&context.shell, keymap.as_str()) {
let mode = match (&context.shell, keymap) {
(Shell::Fish, "default") | (Shell::Zsh, "vicmd") => ShellEditMode::Normal,
_ => ASSUMED_MODE,
};

3
src/modules/jobs.rs
View File

@ -11,7 +11,8 @@ pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> {
let props = &context.properties;
let num_of_jobs = props
.get("jobs")
.unwrap_or(&"0".into())
.map(String::as_str)
.unwrap_or("0")
.trim()
.parse::<i64>()
.ok()?;