process: hide internal structure

Author: djc

src/cli/common.rs

@@ -21,7 +21,7 @@ use crate::{
     errors::RustupError,
     install::UpdateStatus,
     notifications::Notification,
-    process::{Process, terminal_source},
+    process::{Attr, Process},
     toolchain::{LocalToolchainName, Toolchain, ToolchainName},
     utils::{self, notify::NotificationLevel},
 };
@@ -256,7 +256,7 @@ fn show_channel_updates(
         let padding = max_width - width;
         let padding: String = " ".repeat(padding);
         let _ = write!(t.lock(), "  {padding}");
-        let _ = t.attr(terminal_source::Attr::Bold);
+        let _ = t.attr(Attr::Bold);
         if let Some(color) = color {
             let _ = t.fg(color);
         }
@@ -311,7 +311,7 @@ pub(super) fn list_items(
     let mut t = process.stdout();
     for (name, installed) in items {
         if installed && !installed_only && !quiet {
-            t.attr(terminal_source::Attr::Bold)?;
+            t.attr(Attr::Bold)?;
             writeln!(t.lock(), "{name} (installed)")?;
             t.reset()?;
         } else if installed || !installed_only {

src/cli/markdown.rs

@@ -4,7 +4,7 @@ use std::io::Write;
 use pulldown_cmark::{Event, Tag, TagEnd};
 use termcolor::Color;
 
-use crate::process::terminal_source::{Attr, ColorableTerminal};
+use crate::process::{Attr, ColorableTerminal};
 
 // Handles the wrapping of text written to the console
 struct LineWrapper<'a> {

src/cli/rustup_mode.rs

@@ -38,10 +38,7 @@ use crate::{
     },
     errors::RustupError,
     install::{InstallMethod, UpdateStatus},
-    process::{
-        Process,
-        terminal_source::{self, ColorableTerminal},
-    },
+    process::{Attr, ColorableTerminal, Process},
     toolchain::{
         CustomToolchainName, DistributableToolchain, LocalToolchainName,
         MaybeResolvableToolchainName, ResolvableLocalToolchainName, ResolvableToolchainName,
@@ -1074,7 +1071,7 @@ async fn show(cfg: &Cfg<'_>, verbose: bool) -> Result<utils::ExitCode> {
     // Print host triple
     {
         let mut t = cfg.process.stdout();
-        t.attr(terminal_source::Attr::Bold)?;
+        t.attr(Attr::Bold)?;
         write!(t.lock(), "Default host: ")?;
         t.reset()?;
         writeln!(t.lock(), "{}", cfg.get_default_host_triple()?)?;
@@ -1083,7 +1080,7 @@ async fn show(cfg: &Cfg<'_>, verbose: bool) -> Result<utils::ExitCode> {
     // Print rustup home directory
     {
         let mut t = cfg.process.stdout();
-        t.attr(terminal_source::Attr::Bold)?;
+        t.attr(Attr::Bold)?;
         write!(t.lock(), "rustup home:  ")?;
         t.reset()?;
         writeln!(t.lock(), "{}", cfg.rustup_dir.display())?;
@@ -1195,7 +1192,7 @@ async fn show(cfg: &Cfg<'_>, verbose: bool) -> Result<utils::ExitCode> {
     where
         E: From<io::Error>,
     {
-        t.attr(terminal_source::Attr::Bold)?;
+        t.attr(Attr::Bold)?;
         {
             let mut term_lock = t.lock();
             writeln!(term_lock, "{s}")?;

src/cli/self_update.rs

@@ -50,7 +50,6 @@ use serde::{Deserialize, Serialize};
 use termcolor::Color;
 use tracing::{error, info, trace, warn};
 
-use crate::download::download_file;
 use crate::{
     DUP_TOOLS, TOOLS,
     cli::{
@@ -60,9 +59,10 @@ use crate::{
     },
     config::Cfg,
     dist::{self, PartialToolchainDesc, Profile, TargetTriple, ToolchainDesc},
+    download::download_file,
     errors::RustupError,
     install::UpdateStatus,
-    process::{Process, terminal_source},
+    process::{Attr, Process},
     toolchain::{
         DistributableToolchain, MaybeOfficialToolchainName, ResolvableToolchainName, Toolchain,
         ToolchainName,
@@ -1356,7 +1356,7 @@ pub(crate) async fn check_rustup_update(process: &Process) -> anyhow::Result<boo
     // Get available rustup version
     let available_version = get_available_rustup_version(process).await?;
 
-    let _ = t.attr(terminal_source::Attr::Bold);
+    let _ = t.attr(Attr::Bold);
     write!(t.lock(), "rustup - ")?;
 
     Ok(if current_version != available_version {

src/cli/self_update/windows.rs

@@ -23,7 +23,7 @@ use super::{InstallOpts, install_bins, report_error};
 use crate::cli::{download_tracker::DownloadTracker, markdown::md};
 use crate::dist::TargetTriple;
 use crate::download::download_file;
-use crate::process::{Process, terminalsource::ColorableTerminal};
+use crate::process::{ColorableTerminal, Process};
 use crate::utils;
 
 pub(crate) fn ensure_prompt(process: &Process) -> Result<()> {

src/process.rs

@@ -26,8 +26,9 @@ use tracing_subscriber::{EnvFilter, Registry, reload::Handle};
 #[cfg(all(feature = "test", feature = "otel"))]
 use crate::cli::log;
 
-pub mod file_source;
-pub mod terminal_source;
+mod file_source;
+mod terminal_source;
+pub use terminal_source::{Attr, ColorableTerminal};
 
 /// Allows concrete types for the process abstraction.
 #[derive(Clone, Debug)]