holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Set active shell column to boolean (#2540)

Browse Source
This commit is contained in:
Chris Gillespie 2020-09-12 21:25:38 -07:00 committed by GitHub
parent 45f32c9541
commit c355585112
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/nu-cli/src/commands/shells.rs
View File

@ -37,9 +37,9 @@ fn shells(args: CommandArgs, _registry: &CommandRegistry) -> Result<OutputStream
let mut dict = TaggedDictBuilder::new(&tag); let mut dict = TaggedDictBuilder::new(&tag);
if index == (*args.shell_manager.current_shell).load(Ordering::SeqCst) { if index == (*args.shell_manager.current_shell).load(Ordering::SeqCst) {
dict.insert_untagged("active", "X".to_string()); dict.insert_untagged("active", true);
} else { } else {
dict.insert_untagged("active", " ".to_string()); dict.insert_untagged("active", false);
} }
dict.insert_untagged("name", shell.name()); dict.insert_untagged("name", shell.name());
dict.insert_untagged("path", shell.path()); dict.insert_untagged("path", shell.path());

7
crates/nu-protocol/src/value/primitive.rs
View File

@ -136,6 +136,13 @@ impl Primitive {
} }
} }
impl From<bool> for Primitive {
/// Helper to convert from boolean to a primitive
fn from(b: bool) -> Primitive {
Primitive::Boolean(b)
}
}
impl From<&str> for Primitive { impl From<&str> for Primitive {
/// Helper to convert from string slices to a primitive /// Helper to convert from string slices to a primitive
fn from(s: &str) -> Primitive { fn from(s: &str) -> Primitive {