diff options
Diffstat (limited to 'crates/shirabe/src/command')
| -rw-r--r-- | crates/shirabe/src/command/exec_command.rs | 7 | ||||
| -rw-r--r-- | crates/shirabe/src/command/package_discovery_trait.rs | 4 | ||||
| -rw-r--r-- | crates/shirabe/src/command/run_script_command.rs | 7 | ||||
| -rw-r--r-- | crates/shirabe/src/command/update_command.rs | 10 |
4 files changed, 21 insertions, 7 deletions
diff --git a/crates/shirabe/src/command/exec_command.rs b/crates/shirabe/src/command/exec_command.rs index 3eaee5a9..057c9eb2 100644 --- a/crates/shirabe/src/command/exec_command.rs +++ b/crates/shirabe/src/command/exec_command.rs @@ -118,7 +118,12 @@ impl Command for ExecCommand { let io = self.get_io(); let binary = io.select( "Binary to run: ".to_string(), - binaries.clone(), + PhpMixed::List( + binaries + .iter() + .map(|b| PhpMixed::String(b.clone())) + .collect(), + ), PhpMixed::String(String::new()), PhpMixed::Int(1), "Invalid binary name \"%s\"".to_string(), diff --git a/crates/shirabe/src/command/package_discovery_trait.rs b/crates/shirabe/src/command/package_discovery_trait.rs index 830f1996..2ab1d9d5 100644 --- a/crates/shirabe/src/command/package_discovery_trait.rs +++ b/crates/shirabe/src/command/package_discovery_trait.rs @@ -689,7 +689,9 @@ pub trait PackageDiscoveryTrait: BaseCommand { "<error>Could not find package {}.</error>\nPick one of these or leave empty to abort:", name, ), - similar.to_vec(), + PhpMixed::List( + similar.iter().map(|s| PhpMixed::String(s.clone())).collect(), + ), PhpMixed::Bool(false), PhpMixed::Int(1), "No package named \"%s\" is installed.".to_string(), diff --git a/crates/shirabe/src/command/run_script_command.rs b/crates/shirabe/src/command/run_script_command.rs index c256eea2..26e73d6d 100644 --- a/crates/shirabe/src/command/run_script_command.rs +++ b/crates/shirabe/src/command/run_script_command.rs @@ -209,7 +209,12 @@ impl Command for RunScriptCommand { let io = self.get_io(); let script = io.select( "Script to run: ".to_string(), - options.keys().cloned().collect(), + PhpMixed::List( + options + .keys() + .map(|k| PhpMixed::String(k.clone())) + .collect(), + ), PhpMixed::String(String::new()), PhpMixed::Int(1), "Invalid script name \"%s\"".to_string(), diff --git a/crates/shirabe/src/command/update_command.rs b/crates/shirabe/src/command/update_command.rs index b47c51d0..a20d288f 100644 --- a/crates/shirabe/src/command/update_command.rs +++ b/crates/shirabe/src/command/update_command.rs @@ -705,10 +705,12 @@ impl UpdateCommand { let select_result = io.select( "Select packages: (Select more than one value separated by comma) ".to_string(), - autocompleter_values - .keys() - .cloned() - .collect::<Vec<String>>(), + PhpMixed::List( + autocompleter_values + .keys() + .map(|k| PhpMixed::String(k.clone())) + .collect(), + ), PhpMixed::Bool(false), PhpMixed::Int(1), "No package named \"%s\" is installed.".to_string(), |