From 3b78d7d0a4781ca541b4e307afe37f4a0c4d4640 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Palenica?= <pawelpalenica11@gmail.com>
Date: Thu, 8 Jul 2021 22:01:03 -0700
Subject: [PATCH] More cleanup, remove serde from zellij-server

---
 Cargo.lock                           | 1 -
 zellij-server/Cargo.toml             | 1 -
 zellij-server/src/decorating_pipe.rs | 5 ++++-
 zellij-server/src/wasm_vm.rs         | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index aa63b3f1..6d23cea3 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2646,7 +2646,6 @@ dependencies = [
  "daemonize",
  "insta",
  "log",
- "serde",
  "serde_json",
  "typetag",
  "unicode-width",
diff --git a/zellij-server/Cargo.toml b/zellij-server/Cargo.toml
index 9cec6b8a..1a671c3d 100644
--- a/zellij-server/Cargo.toml
+++ b/zellij-server/Cargo.toml
@@ -19,7 +19,6 @@ wasmer-wasi = "1.0.0"
 cassowary = "0.3.0"
 zellij-utils = { path = "../zellij-utils/", version = "0.14.0" }
 log = "0.4.14"
-serde = "1.0.126"
 typetag = "0.1.7"
 
 [dev-dependencies]
diff --git a/zellij-server/src/decorating_pipe.rs b/zellij-server/src/decorating_pipe.rs
index 7f68f50c..65039139 100644
--- a/zellij-server/src/decorating_pipe.rs
+++ b/zellij-server/src/decorating_pipe.rs
@@ -4,12 +4,15 @@ use std::{
 };
 
 use log::{error, info};
-use serde::{Deserialize, Serialize};
 use wasmer_wasi::{WasiFile, WasiFsError};
+use zellij_utils::serde;
+
+use serde::{Deserialize, Serialize};
 
 // 16kB log buffer
 const ZELLIJ_MAX_PIPE_BUFFER_SIZE: usize = 16_384;
 #[derive(Debug, Serialize, Deserialize)]
+#[serde(crate = "self::serde")]
 pub struct DecoratingPipe {
     buffer: VecDeque<u8>,
     plugin_name: String,
diff --git a/zellij-server/src/wasm_vm.rs b/zellij-server/src/wasm_vm.rs
index 0f676169..fe8f5be7 100644
--- a/zellij-server/src/wasm_vm.rs
+++ b/zellij-server/src/wasm_vm.rs
@@ -8,7 +8,7 @@ use std::sync::{mpsc::Sender, Arc, Mutex};
 use std::thread;
 use std::time::{Duration, Instant};
 
-use zellij_utils::zellij_tile;
+use zellij_utils::{serde, zellij_tile};
 
 use serde::{de::DeserializeOwned, Serialize};
 use wasmer::{