From a417f9b6440871bbec26520f0921189ee156e9ff Mon Sep 17 00:00:00 2001
From: Ben Bridle <ben@derelict.engineering>
Date: Sun, 27 Apr 2025 12:41:59 +1200
Subject: Update assembler and log libraries

This update replaces all uses of the ansi library with the new inked
library. This means that terminal colours will now be handled correctly
under Windows.
---
 Cargo.lock         | 124 ++++++++++++++++++++++++++++++++++++++++++++++-------
 Cargo.toml         |   4 +-
 src/formats/mod.rs |   2 -
 3 files changed, 111 insertions(+), 19 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 35b2c13..b7377e8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2,18 +2,13 @@
 # It is not intended for manual editing.
 version = 4
 
-[[package]]
-name = "ansi"
-version = "1.0.0"
-source = "git+git://benbridle.com/ansi?tag=v1.0.0#81d47867c2c97a9ae1d1c8fdfcd42c582410ad2a"
-
 [[package]]
 name = "assembler"
-version = "2.2.2"
-source = "git+git://benbridle.com/assembler?tag=v2.2.2#85c1fd299e04e27307a1c1633282df6f1d579a98"
+version = "2.3.0"
+source = "git+git://benbridle.com/assembler?tag=v2.3.0#a9640fce1aaa5e80170ce4d2ac700f66cfffbb4b"
 dependencies = [
- "ansi",
- "log 1.1.2",
+ "inked",
+ "log 2.0.0",
  "vagabond",
 ]
 
@@ -39,6 +34,14 @@ dependencies = [
  "hashbrown",
 ]
 
+[[package]]
+name = "inked"
+version = "1.0.0"
+source = "git+git://benbridle.com/inked?tag=v1.0.0#2954d37b638fa2c1dd3d51ff53f08f475aea6ea3"
+dependencies = [
+ "termcolor",
+]
+
 [[package]]
 name = "log"
 version = "1.1.1"
@@ -46,10 +49,10 @@ source = "git+git://benbridle.com/log?tag=v1.1.1#930f3d0e2b82df1243f423c092a3854
 
 [[package]]
 name = "log"
-version = "1.1.2"
-source = "git+git://benbridle.com/log?tag=v1.1.2#3d5d1f7a19436151ba1dd52a2b50664969d90db6"
+version = "2.0.0"
+source = "git+git://benbridle.com/log?tag=v2.0.0#a38d3dd487594f41151db57625410d1b786bebe4"
 dependencies = [
- "ansi",
+ "inked",
 ]
 
 [[package]]
@@ -67,17 +70,108 @@ dependencies = [
  "paste",
 ]
 
+[[package]]
+name = "termcolor"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
+dependencies = [
+ "winapi-util",
+]
+
 [[package]]
 name = "torque-asm"
 version = "2.4.0"
 dependencies = [
  "assembler",
  "indexmap",
- "log 1.1.2",
+ "log 2.0.0",
  "switchboard",
 ]
 
 [[package]]
 name = "vagabond"
-version = "1.0.1"
-source = "git+git://benbridle.com/vagabond?tag=v1.0.1#08f3153fea62ea81a42438347eeee058f5bec199"
+version = "1.1.1"
+source = "git+git://benbridle.com/vagabond?tag=v1.1.1#b190582517e6008ad1deff1859f15988e4efaa26"
+
+[[package]]
+name = "winapi-util"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
+dependencies = [
+ "windows-sys",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_gnullvm",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
diff --git a/Cargo.toml b/Cargo.toml
index a599805..88ba2e8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -5,8 +5,8 @@ edition = "2021"
 license = "MIT"
 
 [dependencies]
-assembler = { git = "git://benbridle.com/assembler", tag = "v2.2.2" }
-log = { git = "git://benbridle.com/log", tag = "v1.1.2" }
+assembler = { git = "git://benbridle.com/assembler", tag = "v2.3.0" }
+log = { git = "git://benbridle.com/log", tag = "v2.0.0" }
 switchboard = { git = "git://benbridle.com/switchboard", tag = "v2.1.0" }
 
 indexmap = "2.7.1"
diff --git a/src/formats/mod.rs b/src/formats/mod.rs
index 105207c..e15bfbd 100644
--- a/src/formats/mod.rs
+++ b/src/formats/mod.rs
@@ -12,8 +12,6 @@ pub use debug::*;
 
 use crate::*;
 
-use log::*;
-
 
 #[derive(Clone, Copy, PartialEq)]
 pub enum Format {
-- 
cgit v1.2.3-70-g09d2