summaryrefslogtreecommitdiffstats
path: root/src/modules/character.rs
diff options
context:
space:
mode:
authorBarnaby Keene <accounts@southcla.ws>2019-10-20 09:26:27 +0100
committerMatan Kushner <hello@matchai.me>2019-10-20 17:26:27 +0900
commit2c7e01cd6221b60cc08d2e5873493c00817ee1b6 (patch)
tree39436a6b06ff4e506135ead8f1c0ad5bcdfee89f /src/modules/character.rs
parent48cd6bc519d7f3c1da58a662f65220c552387b41 (diff)
refactor: improve as-a-library usage by removing ArgMatches depeā€¦ (#547)
This removes ArgMatches from the Context struct and replaces it with a simple HashMap. This work is towards getting Starship in a better place for use as a library in other shells written in Rust so they don't need to use a command-line interface to invoke and configure things. Contributes to #521
Diffstat (limited to 'src/modules/character.rs')
-rw-r--r--src/modules/character.rs11
1 files changed, 7 insertions, 4 deletions
diff --git a/src/modules/character.rs b/src/modules/character.rs
index 45f0c7102..cc9545172 100644
--- a/src/modules/character.rs
+++ b/src/modules/character.rs
@@ -22,17 +22,20 @@ pub fn module<'a>(context: &'a Context) -> Option<Module<'a>> {
let config: CharacterConfig = CharacterConfig::try_load(module.config);
module.get_prefix().set_value("");
- let arguments = &context.arguments;
- let exit_success = arguments.value_of("status_code").unwrap_or("0") == "0";
+ let props = &context.properties;
+ let exit_code_default = std::string::String::from("0");
+ let exit_code = props.get("status_code").unwrap_or(&exit_code_default);
let shell = std::env::var("STARSHIP_SHELL").unwrap_or_default();
- let keymap = arguments.value_of("keymap").unwrap_or("viins");
+ let keymap_default = std::string::String::from("viins");
+ let keymap = props.get("keymap").unwrap_or(&keymap_default);
+ let exit_success = exit_code == "0";
// Match shell "keymap" names to normalized vi modes
// NOTE: in vi mode, fish reports normal mode as "default".
// 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 (shell.as_str(), keymap) {
+ let mode = match (shell.as_str(), keymap.as_str()) {
("fish", "default") | ("zsh", "vicmd") => ShellEditMode::Normal,
_ => ASSUMED_MODE,
};