Clippy fixes and renaming

Author: NicholasLYang

crates/turborepo-lib/src/daemon/default_timeout_layer.rs

@@ -85,7 +85,7 @@ mod test {
         sync::{Arc, Mutex},
     };
 
-    use axum::http::HeaderValue;
+    use reqwest::header::HeaderValue;
     use test_case::test_case;
 
     use super::*;

crates/turborepo-lib/src/opts.rs

@@ -382,6 +382,7 @@ mod test {
     use crate::{
         cli::DryRunMode,
         opts::{Opts, RunCacheOpts, ScopeOpts},
+        turbo_json::UIMode,
     };
 
     #[derive(Default)]
@@ -468,6 +469,7 @@ mod test {
             only: opts_input.only,
             dry_run: opts_input.dry_run,
             graph: None,
+            ui_mode: UIMode::Tui,
             single_package: false,
             log_prefix: crate::opts::ResolvedLogPrefix::Task,
             log_order: crate::opts::ResolvedLogOrder::Stream,

crates/turborepo-lib/src/run/error.rs

@@ -57,5 +57,7 @@ pub enum Error {
     #[error(transparent)]
     Daemon(#[from] daemon::DaemonError),
     #[error(transparent)]
+    UI(#[from] turborepo_ui::Error),
+    #[error(transparent)]
     Tui(#[from] tui::Error),
 }

crates/turborepo-lib/src/run/mod.rs

@@ -32,7 +32,7 @@ use turborepo_repository::package_graph::{PackageGraph, PackageName, PackageNode
 use turborepo_scm::SCM;
 use turborepo_telemetry::events::generic::GenericEventBuilder;
 use turborepo_ui::{
-    cprint, cprintln, sender::UISender, tui, tui::AppSender, wui::WebUISender, BOLD_GREY, GREY, UI,
+    cprint, cprintln, sender::UISender, tui, tui::TuiSender, wui::WebUISender, BOLD_GREY, GREY, UI,
 };
 
 pub use crate::run::error::Error;
@@ -73,6 +73,10 @@ pub struct Run {
     should_print_prelude: bool,
 }
 
+type UIResult = Result<Option<(UISender, JoinHandle<Result<(), turborepo_ui::Error>>)>, Error>;
+type WuiResult = Result<Option<(WebUISender, JoinHandle<Result<(), turborepo_ui::Error>>)>, Error>;
+type TuiResult = Result<Option<(TuiSender, JoinHandle<Result<(), turborepo_ui::Error>>)>, Error>;
+
 impl Run {
     fn has_persistent_tasks(&self) -> bool {
         self.engine.has_persistent_tasks
@@ -183,9 +187,7 @@ impl Run {
             && tui::terminal_big_enough()?)
     }
 
-    pub fn start_ui(
-        &self,
-    ) -> Result<Option<(UISender, JoinHandle<Result<(), turborepo_ui::Error>>)>, Error> {
+    pub fn start_ui(&self) -> UIResult {
         match self.opts.run_opts.ui_mode {
             UIMode::Tui => self
                 .start_terminal_ui()
@@ -196,9 +198,7 @@ impl Run {
                 .map(|res| res.map(|(sender, handle)| (UISender::Wui(sender), handle))),
         }
     }
-    pub fn start_web_ui(
-        &self,
-    ) -> Result<Option<(WebUISender, JoinHandle<Result<(), turborepo_ui::Error>>)>, Error> {
+    pub fn start_web_ui(&self) -> WuiResult {
         let (tx, rx) = tokio::sync::broadcast::channel(100);
 
         let handle = tokio::spawn(turborepo_ui::wui::start_ws_server(rx));
@@ -207,9 +207,7 @@ impl Run {
     }
 
     #[allow(clippy::type_complexity)]
-    pub fn start_terminal_ui(
-        &self,
-    ) -> Result<Option<(AppSender, JoinHandle<Result<(), turborepo_ui::Error>>)>, Error> {
+    pub fn start_terminal_ui(&self) -> TuiResult {
         // Print prelude here as this needs to happen before the UI is started
         if self.should_print_prelude {
             self.print_run_prelude();
@@ -225,7 +223,7 @@ impl Run {
             return Ok(None);
         }
 
-        let (sender, receiver) = AppSender::new();
+        let (sender, receiver) = TuiSender::new();
         let handle = tokio::task::spawn_blocking(move || Ok(tui::run_app(task_names, receiver)?));
 
         Ok(Some((sender, handle)))

crates/turborepo-lib/src/run/watch.rs

@@ -98,6 +98,8 @@ pub enum Error {
     SignalInterrupt,
     #[error("package change error")]
     PackageChange(#[from] tonic::Status),
+    #[error(transparent)]
+    UI(#[from] turborepo_ui::Error),
     #[error("could not connect to UI thread")]
     UISend(String),
 }

crates/turborepo-ui/src/sender.rs

@@ -8,7 +8,7 @@ use crate::{
 
 #[derive(Debug, Clone)]
 pub enum UISender {
-    Tui(tui::AppSender),
+    Tui(tui::TuiSender),
     Wui(wui::WebUISender),
 }
 

crates/turborepo-ui/src/tui/handle.rs

@@ -8,7 +8,7 @@ use crate::sender::{TaskSender, UISender};
 
 /// Struct for sending app events to TUI rendering
 #[derive(Debug, Clone)]
-pub struct AppSender {
+pub struct TuiSender {
     primary: mpsc::Sender<Event>,
 }
 
@@ -17,7 +17,7 @@ pub struct AppReceiver {
     primary: mpsc::Receiver<Event>,
 }
 
-impl AppSender {
+impl TuiSender {
     /// Create a new channel for sending app events.
     ///
     /// AppSender is meant to be held by the actual task runner
@@ -35,7 +35,7 @@ impl AppSender {
     }
 }
 
-impl AppSender {
+impl TuiSender {
     pub fn start_task(&self, task: String, output_logs: OutputLogs) {
         self.primary
             .send(Event::StartTask { task, output_logs })

crates/turborepo-ui/src/tui/mod.rs

@@ -12,7 +12,7 @@ mod term_output;
 pub use app::{run_app, terminal_big_enough};
 use clipboard::copy_to_clipboard;
 use event::{Event, TaskResult};
-pub use handle::{AppReceiver, AppSender};
+pub use handle::{AppReceiver, TuiSender};
 use input::{input, InputOptions};
 pub use pane::TerminalPane;
 pub use table::TaskTable;

crates/turborepo-ui/src/wui/mod.rs

@@ -150,6 +150,7 @@ pub enum ClientMessage {
 struct AppState {
     rx: tokio::sync::broadcast::Receiver<WebUIEvent>,
     // We use a tokio::sync::Mutex here because we want this future to be Send.
+    #[allow(clippy::type_complexity)]
     messages: Arc<Mutex<RefCell<Vec<(WebUIEvent, u32)>>>>,
     current_id: Arc<AtomicU32>,
 }