aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaweł Palenica <pawelpalenica11@gmail.com>2021-07-08 21:49:56 -0700
committerPaweł Palenica <pawelpalenica11@gmail.com>2021-07-08 21:49:56 -0700
commita076d9ef1437f21b67ca525d4f8bddbca7c14f73 (patch)
treea1442da01506563f558e59fee3fbfbefaab29b89
parentAdd padding to logger (diff)
downloadsl0ppij-a076d9ef1437f21b67ca525d4f8bddbca7c14f73.tar.gz
sl0ppij-a076d9ef1437f21b67ca525d4f8bddbca7c14f73.tar.xz
sl0ppij-a076d9ef1437f21b67ca525d4f8bddbca7c14f73.zip
Cleanup
-rw-r--r--.gitignore3
-rw-r--r--Cargo.lock5
-rw-r--r--zellij-server/Cargo.toml1
-rw-r--r--zellij-server/src/wasm_vm.rs5
-rw-r--r--zellij-tile/Cargo.toml3
-rw-r--r--zellij-utils/Cargo.toml1
-rw-r--r--zellij-utils/src/logging.rs3
7 files changed, 6 insertions, 15 deletions
diff --git a/.gitignore b/.gitignore
index 433d02d7..21a50829 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,5 @@
.vim
.DS_Store
/assets/man/zellij.1
-**/target \ No newline at end of file
+**/target
+zellij.log \ No newline at end of file
diff --git a/Cargo.lock b/Cargo.lock
index 1a51077b..a55e40da 100644
--- a/Cargo.lock
+++ b/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",
]
diff --git a/zellij-server/Cargo.toml b/zellij-server/Cargo.toml
index d06745de..442360d9 100644
--- a/zellij-server/Cargo.toml
+++ b/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"
diff --git a/zellij-server/src/wasm_vm.rs b/zellij-server/src/wasm_vm.rs
index 14823e52..0f676169 100644
--- a/zellij-server/src/wasm_vm.rs
+++ b/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,
diff --git a/zellij-tile/Cargo.toml b/zellij-tile/Cargo.toml
index a2aaab1f..f4c73367 100644
--- a/zellij-tile/Cargo.toml
+++ b/zellij-tile/Cargo.toml
@@ -10,5 +10,4 @@ license = "MIT"
serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
strum = "0.20.0"
-strum_macros = "0.20.0"
-log = "0.4.14"
+strum_macros = "0.20.0" \ No newline at end of file
diff --git a/zellij-utils/Cargo.toml b/zellij-utils/Cargo.toml
index 42a74d54..bf7c60af 100644
--- a/zellij-utils/Cargo.toml
+++ b/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]
diff --git a/zellij-utils/src/logging.rs b/zellij-utils/src/logging.rs
index eb736142..52e91497 100644
--- a/zellij-utils/src/logging.rs
+++ b/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;