clean up completions shell types for clap parsing

Author: pthurlow

src/command.rs

@@ -108,11 +108,28 @@ pub enum Commands {
     /// Generate shell completions
     Completions {
         /// Shell to generate completions for
-        #[arg(value_parser = ["bash", "zsh", "fish"])]
-        shell: String,
+        #[arg(value_enum)]
+        shell: ShellChoice,
     },
 }
 
+#[derive(Clone, clap::ValueEnum)]
+pub enum ShellChoice {
+    Bash,
+    Zsh,
+    Fish,
+}
+
+impl From<ShellChoice> for clap_complete::Shell {
+    fn from(s: ShellChoice) -> Self {
+        match s {
+            ShellChoice::Bash => clap_complete::Shell::Bash,
+            ShellChoice::Zsh => clap_complete::Shell::Zsh,
+            ShellChoice::Fish => clap_complete::Shell::Fish,
+        }
+    }
+}
+
 #[derive(Subcommand)]
 pub enum AuthCommands {
     /// Remove authentication for a profile

src/main.rs

@@ -197,8 +197,8 @@ fn main() {
             }
             Commands::Completions { shell } => {
                 use clap::CommandFactory;
-                use clap_complete::{Shell, generate};
-                let shell: Shell = shell.parse().unwrap();
+                use clap_complete::generate;
+                let shell: clap_complete::Shell = shell.into();
                 let mut cmd = Cli::command();
                 generate(shell, &mut cmd, "hotdata", &mut std::io::stdout());
             }