From 23fadce867ecf39cda456f519a73499a4a92eef1 Mon Sep 17 00:00:00 2001
From: MultisampledNight <contact@multisamplednight.com>
Date: Sat, 20 Jan 2024 21:32:25 +0100
Subject: [PATCH] fix: glue with app from #7

---
 Cargo.lock            | 82 ++++++++++++++++++++++++++++++++++++++-----
 Cargo.toml            |  3 +-
 crates/app/Cargo.toml |  3 ++
 3 files changed, 78 insertions(+), 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index e191631..1f7a514 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -171,15 +171,6 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"
 
-[[package]]
-name = "cli"
-version = "0.1.0"
-dependencies = [
- "clap",
- "executor",
- "ir",
-]
-
 [[package]]
 name = "color_quant"
 version = "1.1.0"
@@ -327,6 +318,17 @@ dependencies = [
  "spin",
 ]
 
+[[package]]
+name = "getrandom"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi",
+]
+
 [[package]]
 name = "gif"
 version = "0.12.0"
@@ -380,6 +382,12 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "itoa"
+version = "1.0.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
+
 [[package]]
 name = "jpeg-decoder"
 version = "0.3.0"
@@ -395,6 +403,23 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "03087c2bad5e1034e8cace5926dec053fb3790248370865f5117a7d0213354c8"
 
+[[package]]
+name = "libc"
+version = "0.2.152"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13e3bf6590cbc649f4d1a3eefc9d5d6eb746f5200ffb04e5e142700b8faa56e7"
+
+[[package]]
+name = "libredox"
+version = "0.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8"
+dependencies = [
+ "bitflags 2.4.1",
+ "libc",
+ "redox_syscall",
+]
+
 [[package]]
 name = "lock_api"
 version = "0.4.11"
@@ -445,6 +470,27 @@ dependencies = [
  "autocfg",
 ]
 
+[[package]]
+name = "num_threads"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2819ce041d2ee131036f4fc9d6ae7ae125a3a40e97ba64d04fe799ad9dabbb44"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "option-ext"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
+
+[[package]]
+name = "owo-colors"
+version = "4.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "caff54706df99d2a78a5a4e3455ff45448d81ef1bb63c22cd14052ca0e993a3f"
+
 [[package]]
 name = "png"
 version = "0.17.10"
@@ -543,6 +589,12 @@ dependencies = [
  "serde_derive",
 ]
 
+[[package]]
+name = "ryu"
+version = "1.0.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f98d2aa92eebf49b69786be48e4477826b256916e84a57ff2a4f21923b48eb4c"
+
 [[package]]
 name = "scopeguard"
 version = "1.2.0"
@@ -687,6 +739,12 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
 
+[[package]]
+name = "wasi"
+version = "0.11.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+
 [[package]]
 name = "weezl"
 version = "0.1.7"
@@ -825,6 +883,12 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
 
+[[package]]
+name = "yansi"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
+
 [[package]]
 name = "zune-inflate"
 version = "0.2.54"
diff --git a/Cargo.toml b/Cargo.toml
index f4aa395..7e5ee39 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,13 +1,14 @@
 [workspace]
 members = [
+  "crates/app",
   "crates/executor",
   "crates/ir",
-  "crates/cli",
 ]
 resolver = "2"
 
 [workspace.dependencies]
 clap = { version = "4", features = ["derive"] }
+serde = { version = "1.0", features = ["derive"] }
 
 # to enable all the lints below, this must be present in a workspace member's Cargo.toml:
 # [lints]
diff --git a/crates/app/Cargo.toml b/crates/app/Cargo.toml
index a0043ee..92315cf 100644
--- a/crates/app/Cargo.toml
+++ b/crates/app/Cargo.toml
@@ -14,3 +14,6 @@ ariadne = "0.4"
 time = { version = "0.3", features = [ "local-offset" ] }
 dirs = "5"
 owo-colors = "4"
+
+[lints]
+workspace = true