Fixes from testing

Issues that have fallen through cracks

Author: durbanlegend

src/bin/thag_cargo.rs

@@ -1,6 +1,5 @@
 /*[toml]
 [dependencies]
-atty = "0.2.14"
 thag_proc_macros = { version = "0.2, thag-auto" }
 thag_common = { version = "0.2, thag-auto" }
 */
@@ -14,9 +13,8 @@ thag_common = { version = "0.2, thag-auto" }
 #[allow(clippy::single_component_path_imports)]
 use inquire;
 use std::{error::Error, path::PathBuf, process::Command};
-use thag_common::{auto_help, help_system::check_help_and_exit};
+use thag_common::{auto_help, help_system::check_help_and_exit, ThagCommonError};
 use thag_proc_macros::file_navigator;
-use thag_rs::tool_errors::ToolError;
 
 file_navigator! {}
 
@@ -192,8 +190,9 @@ fn main() -> Result<(), Box<dyn Error>> {
         ScriptMode::Interactive => {
             // Use the file selector
             let mut navigator = FileNavigator::new();
-            select_file(&mut navigator, Some("rs"), false)
-                .map_err(|e| ToolError::ThreadSafe(format!("Failed to select file: {e}",).into()))?
+            select_file(&mut navigator, Some("rs"), false).map_err(|e| {
+                ThagCommonError::Generic(format!("Failed to select file: {e}",).into())
+            })?
         }
     };
 

src/bin/thag_expand.rs

@@ -1,6 +1,7 @@
 /*[toml]
 [dependencies]
-thag_rs = { version = "0.2, thag-auto", features = ["tools"] }
+thag_common = { version = "0.2, thag-auto" }
+thag_styling = { version = "0.2, thag-auto", features = ["inquire_theming"] }
 */
 
 /// Useful front-end for `thag --cargo <script> --expand`, which in turn uses `cargo-expand` to show the macro expansion
@@ -21,9 +22,9 @@ use std::{
     process::{Command, Stdio},
 };
 use tempfile::tempdir;
-use thag_rs::{
+use thag_common::ThagCommonError;
+use thag_styling::{
     auto_help, file_navigator, help_system::check_help_and_exit, themed_inquire_config,
-    tool_errors::ToolError,
 };
 
 file_navigator! {}
@@ -96,8 +97,9 @@ fn expand_script() -> Result<()> {
         ScriptMode::Interactive => {
             // Use the file selector
             let mut navigator = FileNavigator::new();
-            select_file(&mut navigator, Some("rs"), false)
-                .map_err(|e| ToolError::ThreadSafe(format!("Failed to select file: {e}",).into()))?
+            select_file(&mut navigator, Some("rs"), false).map_err(|e| {
+                ThagCommonError::Generic(format!("Failed to select file: {e}",).into())
+            })?
         }
     };
     if !input_path.exists() {

src/bin/thag_to_rust_script.rs

@@ -3,7 +3,7 @@
 //# Categories: crates, tools
 use std::io::{self, Read, Write};
 
-use thag_rs::{auto_help, help_system::check_help_and_exit};
+use thag_common::{auto_help, help_system::check_help_and_exit};
 fn read_stdin() -> Result<String, io::Error> {
     let mut buffer = String::new();
     io::stdin().lock().read_to_string(&mut buffer)?;