Cli: Derive Default

So that we can instantiate Cli to a safe default with everything
disabled.

Signed-off-by: Daniel Schaefer <[email protected]>

Author: JohnAZoidberg

framework_lib/src/commandline/clap_std.rs

@@ -9,7 +9,7 @@ use clap_num::maybe_hex;
 use crate::chromium_ec::commands::SetGpuSerialMagic;
 use crate::chromium_ec::CrosEcDriverType;
 use crate::commandline::{
-    Cli, ConsoleArg, FpBrightnessArg, HardwareDeviceType, InputDeckModeArg, RebootEcArg,
+    Cli, ConsoleArg, FpBrightnessArg, HardwareDeviceType, InputDeckModeArg, LogLevel, RebootEcArg,
     TabletModeArg,
 };
 
@@ -335,7 +335,7 @@ pub fn parse(args: &[String]) -> Cli {
     };
 
     Cli {
-        verbosity: args.verbosity.log_level_filter(),
+        verbosity: LogLevel(args.verbosity.log_level_filter()),
         versions: args.versions,
         version: args.version,
         features: args.features,

framework_lib/src/commandline/mod.rs

@@ -134,13 +134,22 @@ impl From<InputDeckModeArg> for DeckStateMode {
     }
 }
 
+#[derive(Debug)]
+pub struct LogLevel(log::LevelFilter);
+
+impl Default for LogLevel {
+    fn default() -> Self {
+        LogLevel(log::LevelFilter::Error)
+    }
+}
+
 /// Shadows `clap_std::ClapCli` with extras for UEFI
 ///
 /// The UEFI commandline currently doesn't use clap, so we need to shadow the struct.
 /// Also it has extra options.
-#[derive(Debug)]
+#[derive(Debug, Default)]
 pub struct Cli {
-    pub verbosity: log::LevelFilter,
+    pub verbosity: LogLevel,
     pub versions: bool,
     pub version: bool,
     pub features: bool,
@@ -696,7 +705,7 @@ fn compare_version(device: Option<HardwareDeviceType>, version: String, ec: &Cro
 pub fn run_with_args(args: &Cli, _allupdate: bool) -> i32 {
     #[cfg(feature = "uefi")]
     {
-        log::set_max_level(args.verbosity);
+        log::set_max_level(args.verbosity.0);
     }
     #[cfg(not(feature = "uefi"))]
     {
@@ -705,7 +714,7 @@ pub fn run_with_args(args: &Cli, _allupdate: bool) -> i32 {
         //     .filter("FRAMEWORK_COMPUTER_LOG")
         //     .write_style("FRAMEWORK_COMPUTER_LOG_STYLE");
 
-        let level = args.verbosity.as_str();
+        let level = args.verbosity.0.as_str();
         env_logger::Builder::from_env(env_logger::Env::default().default_filter_or(level))
             .format_target(false)
             .format_timestamp(None)

framework_lib/src/commandline/uefi.rs

@@ -11,7 +11,7 @@ use uefi::Identify;
 
 use crate::chromium_ec::commands::SetGpuSerialMagic;
 use crate::chromium_ec::{CrosEcDriverType, HardwareDeviceType};
-use crate::commandline::Cli;
+use crate::commandline::{Cli, LogLevel};
 
 use super::{ConsoleArg, FpBrightnessArg, InputDeckModeArg, RebootEcArg, TabletModeArg};
 
@@ -54,7 +54,7 @@ pub fn get_args(boot_services: &BootServices) -> Vec<String> {
 
 pub fn parse(args: &[String]) -> Cli {
     let mut cli = Cli {
-        verbosity: log::LevelFilter::Error,
+        verbosity: LogLevel(log::LevelFilter::Error),
         paginate: false,
         versions: false,
         version: false,
@@ -122,15 +122,15 @@ pub fn parse(args: &[String]) -> Cli {
 
     for (i, arg) in args.iter().enumerate() {
         if arg == "-q" {
-            cli.verbosity = log::LevelFilter::Off;
+            cli.verbosity = LogLevel(log::LevelFilter::Off);
         } else if arg == "-v" {
-            cli.verbosity = log::LevelFilter::Warn;
+            cli.verbosity = LogLevel(log::LevelFilter::Warn);
         } else if arg == "-vv" {
-            cli.verbosity = log::LevelFilter::Info;
+            cli.verbosity = LogLevel(log::LevelFilter::Info);
         } else if arg == "-vvv" {
-            cli.verbosity = log::LevelFilter::Debug;
+            cli.verbosity = LogLevel(log::LevelFilter::Debug);
         } else if arg == "-vvvv" {
-            cli.verbosity = log::LevelFilter::Trace;
+            cli.verbosity = LogLevel(log::LevelFilter::Trace);
         } else if arg == "--versions" {
             cli.versions = true;
             found_an_option = true;