Cleanup

.gitignore

@@ -5,3 +5,4 @@
 .DS_Store 
 /assets/man/zellij.1
 **/target
+zellij.log

Cargo.lock

@@ -2277,8 +2277,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d54ee1d4ed486f78874278e63e4069fc1ab9f6a18ca492076ffb90c5eb2997fd"
 dependencies = [
  "cfg-if 1.0.0",
- "serde",
- "serde_json",
  "wasm-bindgen-macro",
 ]
 
@@ -2653,7 +2651,6 @@ dependencies = [
  "serde_json",
  "typetag",
  "unicode-width",
- "wasm-bindgen",
  "wasmer",
  "wasmer-wasi",
  "zellij-utils",
@@ -2663,7 +2660,6 @@ dependencies = [
 name = "zellij-tile"
 version = "0.14.0"
 dependencies = [
- "log",
  "serde",
  "serde_json",
  "strum",
@@ -2702,7 +2698,6 @@ dependencies = [
  "strum",
  "tempfile",
  "termion",
- "typetag",
  "vte 0.10.1",
  "zellij-tile",
 ]

zellij-server/Cargo.toml

@@ -16,7 +16,6 @@ serde_json = "1.0"
 unicode-width = "0.1.8"
 wasmer = "1.0.0"
 wasmer-wasi = "1.0.0"
-wasm-bindgen = { version = "0.2", features = ["serde-serialize"] }
 cassowary = "0.3.0"
 zellij-utils = { path = "../zellij-utils/", version = "0.14.0" }
 log = "0.4.14"

zellij-server/src/wasm_vm.rs

@@ -1,8 +1,6 @@
 use log::info;
-use serde::{de::DeserializeOwned, Serialize};
 use std::collections::{HashMap, HashSet};
 use std::fs;
-use std::io::{Read, Write};
 use std::path::PathBuf;
 use std::process;
 use std::str::FromStr;
@@ -10,8 +8,9 @@ use std::sync::{mpsc::Sender, Arc, Mutex};
 use std::thread;
 use std::time::{Duration, Instant};
 
-use zellij_utils::{serde, zellij_tile};
+use zellij_utils::zellij_tile;
 
+use serde::{de::DeserializeOwned, Serialize};
 use wasmer::{
     imports, ChainableNamedResolver, Function, ImportObject, Instance, Module, Store, Value,
     WasmerEnv,

zellij-tile/Cargo.toml

@@ -11,4 +11,3 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 strum = "0.20.0"
 strum_macros = "0.20.0"
-log = "0.4.14"

zellij-utils/Cargo.toml

@@ -29,7 +29,6 @@ termion = "1.5.0"
 vte = "0.10.1"
 zellij-tile = { path = "../zellij-tile/", version = "0.14.0" }
 log = "0.4.14"
-typetag = "0.1.7"
 log4rs = "1.0.0"
 
 [dependencies.async-std]

zellij-utils/src/logging.rs

@@ -1,11 +1,10 @@
 //! Zellij logging utility functions.
 
 use std::{
-    fs::{self, OpenOptions},
+    fs,
     io::{self, prelude::*},
     os::unix::io::RawFd,
     path::{Path, PathBuf},
-    thread,
 };
 
 use log::info;