refactor(cli/setup-mode): extract update_console_logger()

Author: rami3l

src/cli/common.rs

@@ -13,6 +13,7 @@ use std::{cmp, env};
 use anyhow::{anyhow, Context, Result};
 use git_testament::{git_testament, render_testament};
 use tracing::{debug, error, info, trace, warn};
+use tracing_subscriber::{reload::Handle, EnvFilter, Registry};
 
 use super::self_update;
 use crate::{
@@ -652,3 +653,31 @@ pub(crate) fn warn_if_host_is_emulated(process: &Process) {
         warn!("For best compatibility and performance you should reinstall rustup for your native CPU.");
     }
 }
+
+/// Updates the console logger level according to whether `quiet` or `verbose` is set to `true`.
+///
+/// Does nothing if at least one of the following conditions is met:
+/// - The `RUSTUP_LOG` environment variable is set.
+/// - Both `quiet` and `verbose` are set to `true`.
+pub(super) fn update_console_filter(
+    process: &Process,
+    filter: &Handle<EnvFilter, Registry>,
+    quiet: bool,
+    verbose: bool,
+) {
+    if process.var("RUSTUP_LOG").is_ok() {
+        return;
+    }
+
+    let maybe_directives = match (quiet, verbose) {
+        (true, _) => Some("rustup=WARN"),
+        (_, true) => Some("rustup=DEBUG"),
+        (_, _) => None,
+    };
+
+    if let Some(directives) = maybe_directives {
+        filter
+            .modify(|it| *it = EnvFilter::new(directives))
+            .expect("error reloading `EnvFilter` for console_logger");
+    }
+}

src/cli/setup_mode.rs

@@ -7,7 +7,7 @@ use tracing_subscriber::{reload::Handle, EnvFilter, Registry};
 
 use crate::{
     cli::{
-        common,
+        common::{self, update_console_filter},
         self_update::{self, InstallOpts},
     },
     dist::Profile,
@@ -115,18 +115,7 @@ pub async fn main(
         warn!("{}", common::WARN_COMPLETE_PROFILE);
     }
 
-    if process.var("RUSTUP_LOG").is_err() {
-        if quiet {
-            console_filter
-                .modify(|it| *it = EnvFilter::new("rustup=WARN"))
-                .expect("error reloading `EnvFilter` for console_logger");
-        }
-        if verbose {
-            console_filter
-                .modify(|it| *it = EnvFilter::new("rustup=DEBUG"))
-                .expect("error reloading `EnvFilter` for console_logger");
-        }
-    }
+    update_console_filter(process, &console_filter, quiet, verbose);
 
     let opts = InstallOpts {
         default_host_triple: default_host,