From 4e575685a150fd1197aea62d9cad752bf5558152 Mon Sep 17 00:00:00 2001 From: Nora Widdecke Date: Tue, 25 Oct 2022 18:37:41 +0200 Subject: [PATCH] opgpcard: Make default output values type safe --- tools/src/bin/opgpcard/cli.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/src/bin/opgpcard/cli.rs b/tools/src/bin/opgpcard/cli.rs index d5874ec..92579cd 100644 --- a/tools/src/bin/opgpcard/cli.rs +++ b/tools/src/bin/opgpcard/cli.rs @@ -7,8 +7,8 @@ use std::path::PathBuf; use crate::{OutputFormat, OutputVersion}; -pub const DEFAULT_OUTPUT_VERSION: &str = "0.9.0"; pub const OUTPUT_VERSIONS: &[OutputVersion] = &[OutputVersion::new(0, 9, 0)]; +pub const DEFAULT_OUTPUT_VERSION: OutputVersion = OutputVersion::new(0, 9, 0); #[derive(Parser, Debug)] #[clap( @@ -20,11 +20,11 @@ pub const OUTPUT_VERSIONS: &[OutputVersion] = &[OutputVersion::new(0, 9, 0)]; )] pub struct Cli { /// Produce output in the chosen format. - #[clap(long, value_enum, default_value = "text")] + #[clap(long, value_enum, default_value_t = OutputFormat::Text)] pub output_format: OutputFormat, /// Pick output version to use, for non-textual formats. - #[clap(long, default_value = DEFAULT_OUTPUT_VERSION)] + #[clap(long, default_value_t = DEFAULT_OUTPUT_VERSION)] pub output_version: OutputVersion, #[clap(subcommand)]