Use tracing macros directly

Author: djc

src/cli/common.rs

@@ -11,6 +11,7 @@ use std::{cmp, env};
 use anyhow::{anyhow, Context, Result};
 use git_testament::{git_testament, render_testament};
 use once_cell::sync::Lazy;
+use tracing::{debug, error, info, warn};
 
 use super::self_update;
 use crate::cli::download_tracker::DownloadTracker;
@@ -159,7 +160,7 @@ impl Notifier {
             match level {
                 NotificationLevel::Verbose => {
                     if self.verbose {
-                        verbose!("{}", n);
+                        debug!("{}", n);
                     }
                 }
                 NotificationLevel::Info => {
@@ -169,7 +170,7 @@ impl Notifier {
                     warn!("{}", n);
                 }
                 NotificationLevel::Error => {
-                    err!("{}", n);
+                    error!("{}", n);
                 }
                 NotificationLevel::Debug => {
                     debug!("{}", n);
@@ -359,7 +360,7 @@ where
 {
     match self_update_permitted(false)? {
         SelfUpdatePermission::HardFail => {
-            err!("Unable to self-update.  STOP");
+            error!("Unable to self-update.  STOP");
             return Ok(utils::ExitCode(1));
         }
         SelfUpdatePermission::Skip => return Ok(utils::ExitCode(0)),
@@ -604,9 +605,9 @@ pub fn report_error(e: &anyhow::Error, process: &Process) {
     // hunk to revisit, that and a similar build.rs auto-detect glue as anyhow
     // has to detect when backtrace is available.
     if show_backtrace(process) {
-        err!("{:?}", e);
+        error!("{:?}", e);
     } else {
-        err!("{:#}", e);
+        error!("{:#}", e);
     }
 }
 

src/cli/job.rs

@@ -40,6 +40,7 @@ mod imp {
     use std::mem;
     use std::ptr;
 
+    use tracing::info;
     use windows_sys::Win32::Foundation::*;
     use windows_sys::Win32::System::JobObjects::*;
     use windows_sys::Win32::System::Threading::*;

src/cli/log.rs

@@ -18,26 +18,6 @@ use opentelemetry_sdk::trace::Tracer;
 
 use crate::{currentprocess::Process, utils::notify::NotificationLevel};
 
-macro_rules! debug {
-    ( $ ( $ arg : tt ) * ) => ( ::tracing::trace ! ( $ ( $ arg ) * )  )
-}
-
-macro_rules! verbose {
-    ( $ ( $ arg : tt ) * ) => ( ::tracing::debug ! ( $ ( $ arg ) * )  )
-}
-
-macro_rules! info {
-    ( $ ( $ arg : tt ) * ) => ( ::tracing::info ! ( $ ( $ arg ) * )  )
-}
-
-macro_rules! warn {
-    ( $ ( $ arg : tt ) * ) => ( ::tracing::warn ! ( $ ( $ arg ) * )  )
-}
-
-macro_rules! err {
-    ( $ ( $ arg : tt ) * ) => ( ::tracing::error ! ( $ ( $ arg ) * )  )
-}
-
 pub fn tracing_subscriber(process: &Process) -> impl tracing::Subscriber {
     use tracing_subscriber::{layer::SubscriberExt, Registry};
 

src/cli/rustup_mode.rs

@@ -8,6 +8,7 @@ use anyhow::{anyhow, Error, Result};
 use clap::{builder::PossibleValue, Args, CommandFactory, Parser, Subcommand, ValueEnum};
 use clap_complete::Shell;
 use itertools::Itertools;
+use tracing::{debug, error, info, warn};
 
 use crate::{
     cli::{
@@ -828,7 +829,7 @@ async fn update(cfg: &mut Cfg<'_>, opts: UpdateOpts) -> Result<utils::ExitCode>
 
                 let target_triple = name.clone().resolve(&host_arch)?.target;
                 if !forced && !host_arch.can_run(&target_triple)? {
-                    err!("DEPRECATED: future versions of rustup will require --force-non-host to install a non-host toolchain.");
+                    error!("DEPRECATED: future versions of rustup will require --force-non-host to install a non-host toolchain.");
                     warn!("toolchain '{name}' may not be able to run on this system.");
                     warn!(
                             "If you meant to build software to target that platform, perhaps try `rustup target add {}` instead?",

src/cli/self_update.rs

@@ -61,6 +61,7 @@ use clap::ValueEnum;
 use itertools::Itertools;
 use same_file::Handle;
 use serde::{Deserialize, Serialize};
+use tracing::{debug, error, info, warn};
 
 use crate::currentprocess::terminalsource;
 use crate::errors::RustupError;
@@ -983,8 +984,8 @@ async fn maybe_install_rust(
 
 pub(crate) fn uninstall(no_prompt: bool, process: &Process) -> Result<utils::ExitCode> {
     if NEVER_SELF_UPDATE {
-        err!("self-uninstall is disabled for this build of rustup");
-        err!("you should probably use your system package manager to uninstall rustup");
+        error!("self-uninstall is disabled for this build of rustup");
+        error!("you should probably use your system package manager to uninstall rustup");
         return Ok(utils::ExitCode(1));
     }
 
@@ -1110,8 +1111,8 @@ pub(crate) async fn update(cfg: &Cfg<'_>) -> Result<utils::ExitCode> {
     match update_permitted {
         HardFail => {
             // TODO: Detect which package manager and be more useful.
-            err!("self-update is disabled for this build of rustup");
-            err!("you should probably use your system package manager to update rustup");
+            error!("self-update is disabled for this build of rustup");
+            error!("you should probably use your system package manager to update rustup");
             return Ok(utils::ExitCode(1));
         }
         Skip => {
@@ -1124,7 +1125,7 @@ pub(crate) async fn update(cfg: &Cfg<'_>) -> Result<utils::ExitCode> {
     match prepare_update(cfg.process).await? {
         Some(setup_path) => {
             let Some(version) = get_and_parse_new_rustup_version(&setup_path) else {
-                err!("failed to get rustup version");
+                error!("failed to get rustup version");
                 return Ok(utils::ExitCode(1));
             };
 

src/cli/self_update/unix.rs

@@ -2,6 +2,7 @@ use std::path::{Path, PathBuf};
 use std::process::Command;
 
 use anyhow::{bail, Context, Result};
+use tracing::{error, warn};
 
 use super::install_bins;
 use super::shell;
@@ -34,11 +35,11 @@ pub(crate) fn do_anti_sudo_check(no_prompt: bool, process: &Process) -> Result<u
     match home_mismatch(process) {
         (false, _, _) => {}
         (true, env_home, euid_home) => {
-            err!("$HOME differs from euid-obtained home directory: you may be using sudo");
-            err!("$HOME directory: {}", env_home.display());
-            err!("euid-obtained home directory: {}", euid_home.display());
+            error!("$HOME differs from euid-obtained home directory: you may be using sudo");
+            error!("$HOME directory: {}", env_home.display());
+            error!("euid-obtained home directory: {}", euid_home.display());
             if !no_prompt {
-                err!("if this is what you want, restart the installation with `-y'");
+                error!("if this is what you want, restart the installation with `-y'");
                 return Ok(utils::ExitCode(1));
             }
         }

src/cli/self_update/windows.rs

@@ -8,6 +8,7 @@ use std::process::Command;
 use std::sync::{Arc, Mutex};
 
 use anyhow::{anyhow, Context, Result};
+use tracing::{info, warn};
 
 use super::super::errors::*;
 use super::common;

src/cli/setup_mode.rs

@@ -2,6 +2,7 @@ use std::path::PathBuf;
 
 use anyhow::Result;
 use clap::Parser;
+use tracing::warn;
 
 use crate::{
     cli::{

src/config.rs

@@ -9,6 +9,7 @@ use anyhow::{anyhow, bail, Context, Result};
 use serde::Deserialize;
 use thiserror::Error as ThisError;
 use tokio_stream::StreamExt;
+use tracing::debug;
 
 use crate::settings::MetadataVersion;
 use crate::{

src/dist/component/package.rs

@@ -10,6 +10,7 @@ use std::path::{Path, PathBuf};
 
 use anyhow::{anyhow, bail, Context, Result};
 use tar::EntryType;
+use tracing::warn;
 
 use crate::currentprocess::Process;
 use crate::diskio::{get_executor, CompletedIo, Executor, FileBuffer, Item, Kind, IO_CHUNK_SIZE};