process: don't re-export external items

Author: djc

src/cli/common.rs

@@ -10,6 +10,7 @@ use std::{cmp, env};
 
 use anyhow::{Context, Result, anyhow};
 use git_testament::{git_testament, render_testament};
+use termcolor::Color;
 use tracing::{debug, error, info, trace, warn};
 use tracing_subscriber::{EnvFilter, Registry, reload::Handle};
 
@@ -203,10 +204,10 @@ fn show_channel_updates(
 ) -> Result<()> {
     let data = updates.into_iter().map(|(pkg, result)| {
         let (banner, color) = match &result {
-            Ok(UpdateStatus::Installed) => ("installed", Some(terminal_source::Color::Green)),
-            Ok(UpdateStatus::Updated(_)) => ("updated", Some(terminal_source::Color::Green)),
+            Ok(UpdateStatus::Installed) => ("installed", Some(Color::Green)),
+            Ok(UpdateStatus::Updated(_)) => ("updated", Some(Color::Green)),
             Ok(UpdateStatus::Unchanged) => ("unchanged", None),
-            Err(_) => ("update failed", Some(terminal_source::Color::Red)),
+            Err(_) => ("update failed", Some(Color::Red)),
         };
 
         let (previous_version, version) = match &pkg {

src/cli/markdown.rs

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

src/cli/rustup_mode.rs

@@ -17,6 +17,7 @@ use console::style;
 use futures_util::stream::StreamExt;
 use indicatif::{MultiProgress, ProgressBar, ProgressStyle};
 use itertools::Itertools;
+use termcolor::ColorChoice;
 use tokio::sync::Semaphore;
 use tracing::{info, trace, warn};
 use tracing_subscriber::{EnvFilter, Registry, reload::Handle};
@@ -39,7 +40,7 @@ use crate::{
     install::{InstallMethod, UpdateStatus},
     process::{
         Process,
-        terminal_source::{self, ColorChoice, ColorableTerminal},
+        terminal_source::{self, ColorableTerminal},
     },
     toolchain::{
         CustomToolchainName, DistributableToolchain, LocalToolchainName,

src/cli/self_update.rs

@@ -47,6 +47,7 @@ use clap::builder::PossibleValue;
 use itertools::Itertools;
 use same_file::Handle;
 use serde::{Deserialize, Serialize};
+use termcolor::Color;
 use tracing::{error, info, trace, warn};
 
 use crate::download::download_file;
@@ -1359,13 +1360,13 @@ pub(crate) async fn check_rustup_update(process: &Process) -> anyhow::Result<boo
     write!(t.lock(), "rustup - ")?;
 
     Ok(if current_version != available_version {
-        let _ = t.fg(terminal_source::Color::Yellow);
+        let _ = t.fg(Color::Yellow);
         write!(t.lock(), "Update available")?;
         let _ = t.reset();
         writeln!(t.lock(), " : {current_version} -> {available_version}")?;
         true
     } else {
-        let _ = t.fg(terminal_source::Color::Green);
+        let _ = t.fg(Color::Green);
         write!(t.lock(), "Up to date")?;
         let _ = t.reset();
         writeln!(t.lock(), " : {current_version}")?;

src/process/terminal_source.rs

@@ -9,8 +9,7 @@ use std::{
     sync::{Arc, Mutex, MutexGuard},
 };
 
-pub(crate) use termcolor::{Color, ColorChoice};
-use termcolor::{ColorSpec, StandardStream, StandardStreamLock, WriteColor};
+use termcolor::{Color, ColorChoice, ColorSpec, StandardStream, StandardStreamLock, WriteColor};
 
 use super::Process;
 #[cfg(feature = "test")]