chore: remove unmaintained ansi_term in favor of ansiterm

Cargo.toml

@@ -108,7 +108,7 @@ forc-wallet = "0.11"
 #
 
 annotate-snippets = "0.10"
-ansi_term = "0.12"
+ansiterm = "0.12"
 anyhow = "1.0"
 assert-json-diff = "2.0"
 async-trait = "0.1"

forc-pkg/Cargo.toml

@@ -9,7 +9,7 @@ license.workspace = true
 repository.workspace = true
 
 [dependencies]
-ansi_term.workspace = true
+ansiterm.workspace = true
 anyhow.workspace = true
 byte-unit.workspace = true
 cid.workspace = true

forc-pkg/src/lock.rs

@@ -354,7 +354,7 @@ where
             };
             println_action_red(
                 "Removing",
-                &format!("{}{src}", ansi_term::Style::new().bold().paint(&pkg.name)),
+                &format!("{}{src}", ansiterm::Style::new().bold().paint(&pkg.name)),
             );
         }
     }
@@ -372,7 +372,7 @@ where
             };
             println_action_green(
                 "Adding",
-                &format!("{}{src}", ansi_term::Style::new().bold().paint(&pkg.name)),
+                &format!("{}{src}", ansiterm::Style::new().bold().paint(&pkg.name)),
             );
         }
     }

forc-pkg/src/pkg.rs

@@ -2244,13 +2244,13 @@ pub fn build_with_options(build_options: &BuildOpts) -> Result<Built> {
 
 fn print_pkg_summary_header(built_pkg: &BuiltPackage) {
     let prog_ty_str = forc_util::program_type_str(&built_pkg.tree_type);
-    // The ansi_term formatters ignore the `std::fmt` right-align
+    // The ansiterm formatters ignore the `std::fmt` right-align
     // formatter, so we manually calculate the padding to align the program
     // type and name around the 10th column ourselves.
     let padded_ty_str = format!("{prog_ty_str:>10}");
     let padding = &padded_ty_str[..padded_ty_str.len() - prog_ty_str.len()];
-    let ty_ansi = ansi_term::Colour::Green.bold().paint(prog_ty_str);
-    let name_ansi = ansi_term::Style::new()
+    let ty_ansi = ansiterm::Colour::Green.bold().paint(prog_ty_str);
+    let name_ansi = ansiterm::Style::new()
         .bold()
         .paint(&built_pkg.descriptor.name);
     debug!("{padding}{ty_ansi} {name_ansi}");

forc-pkg/src/source/git/mod.rs

@@ -206,11 +206,7 @@ impl source::Fetch for Pinned {
             if !repo_path.exists() {
                 println_action_green(
                     "Fetching",
-                    &format!(
-                        "{} {}",
-                        ansi_term::Style::new().bold().paint(ctx.name),
-                        self
-                    ),
+                    &format!("{} {}", ansiterm::Style::new().bold().paint(ctx.name), self),
                 );
                 fetch(ctx.fetch_id(), ctx.name(), self)?;
             }

forc-pkg/src/source/ipfs.rs

@@ -69,11 +69,7 @@ impl source::Fetch for Pinned {
             if !repo_path.exists() {
                 println_action_green(
                     "Fetching",
-                    &format!(
-                        "{} {}",
-                        ansi_term::Style::new().bold().paint(ctx.name),
-                        self
-                    ),
+                    &format!("{} {}", ansiterm::Style::new().bold().paint(ctx.name), self),
                 );
                 let cid = &self.0;
                 let ipfs_client = ipfs_client();

forc-tracing/Cargo.toml

@@ -9,9 +9,9 @@ license.workspace = true
 repository.workspace = true
 
 [dependencies]
-ansi_term.workspace = true
+ansiterm.workspace = true
 tracing.workspace = true
 tracing-subscriber = { workspace = true, features = ["ansi", "env-filter", "json"] }
 
 [dev-dependencies]
-tracing-test = "0.2"
+tracing-test = "0.2"

forc-tracing/src/lib.rs

@@ -1,6 +1,6 @@
 //! Utility items shared between forc crates.
 
-use ansi_term::Colour;
+use ansiterm::Colour;
 use std::str;
 use std::{env, io};
 use tracing::{Level, Metadata};

forc-util/Cargo.toml

@@ -10,7 +10,7 @@ repository.workspace = true
 
 [dependencies]
 annotate-snippets.workspace = true
-ansi_term.workspace = true
+ansiterm.workspace = true
 anyhow.workspace = true
 clap = { workspace = true, features = ["cargo", "derive", "env"] }
 dirs.workspace = true

forc-util/src/cli.rs

@@ -103,7 +103,7 @@ macro_rules! cli_examples {
 
 
         fn help() -> &'static str {
-            Box::leak(format!("{}\n{}", forc_util::ansi_term::Colour::Yellow.paint("EXAMPLES:"), examples()).into_boxed_str())
+            Box::leak(format!("{}\n{}", forc_util::ansiterm::Colour::Yellow.paint("EXAMPLES:"), examples()).into_boxed_str())
         }
 
         pub fn examples() -> &'static str {

forc-util/src/lib.rs

@@ -29,7 +29,7 @@ pub mod restricted;
 #[macro_use]
 pub mod cli;
 
-pub use ansi_term;
+pub use ansiterm;
 pub use paste;
 pub use regex::Regex;
 pub use serial_test;
@@ -347,7 +347,7 @@ pub fn print_compiling(ty: Option<&TreeType>, name: &str, src: &dyn std::fmt::Di
     };
     println_action_green(
         "Compiling",
-        &format!("{ty}{} ({src})", ansi_term::Style::new().bold().paint(name)),
+        &format!("{ty}{} ({src})", ansiterm::Style::new().bold().paint(name)),
     );
 }
 

forc/Cargo.toml

@@ -18,7 +18,7 @@ path = "src/main.rs"
 
 [dependencies]
 annotate-snippets.workspace = true
-ansi_term.workspace = true
+ansiterm.workspace = true
 anyhow.workspace = true
 clap = { workspace = true, features = ["cargo", "derive", "env"] }
 clap_complete.workspace = true

forc/src/cli/commands/test.rs

@@ -1,5 +1,5 @@
 use crate::cli;
-use ansi_term::Colour;
+use ansiterm::Colour;
 use clap::Parser;
 use forc_pkg as pkg;
 use forc_test::{decode_log_data, TestFilter, TestRunnerCount, TestedPackage};

swayfmt/Cargo.toml

@@ -26,6 +26,6 @@ toml = { workspace = true, features = ["parse"] }
 
 [dev-dependencies]
 paste = "1.0"
-prettydiff = "0.6"
+prettydiff = "0.7"
 similar = "2.0"
 test-macros = { path = "test_macros" }

swayfmt/test_macros/Cargo.toml

@@ -15,7 +15,7 @@ repository.workspace = true
 
 [dev-dependencies]
 paste = "1.0"
-prettydiff = "0.6"
+prettydiff = "0.7"
 
 [package.metadata.cargo-udeps.ignore]
 development = ["paste", "prettydiff"]