summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKunal Mohan <kunalmohan99@gmail.com>2021-05-18 22:16:23 +0530
committerKunal Mohan <kunalmohan99@gmail.com>2021-05-19 01:35:53 +0530
commit040d10df0f85eb0004831eae330adc2690f43dd7 (patch)
tree319788559531522aadcf8b5485c63075370ae656 /src
parentd202cb7394b44f335edce0f6c3c7899b081f9f24 (diff)
Re-export common dependencies from zellij-utils
Diffstat (limited to 'src')
-rw-r--r--src/main.rs2
-rw-r--r--src/tests/fakes.rs9
-rw-r--r--src/tests/utils.rs2
3 files changed, 9 insertions, 4 deletions
diff --git a/src/main.rs b/src/main.rs
index 1e1d4764e..6e90edf54 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -2,7 +2,6 @@
mod tests;
use std::convert::TryFrom;
-use structopt::StructOpt;
use zellij_client::{os_input_output::get_client_os_input, start_client};
use zellij_server::{os_input_output::get_server_os_input, start_server};
use zellij_utils::{
@@ -11,6 +10,7 @@ use zellij_utils::{
input::config::Config,
logging::*,
setup::Setup,
+ structopt::StructOpt,
};
pub fn main() {
diff --git a/src/tests/fakes.rs b/src/tests/fakes.rs
index 09cc2ba3d..b0b77b567 100644
--- a/src/tests/fakes.rs
+++ b/src/tests/fakes.rs
@@ -1,18 +1,21 @@
-use crate::tests::possible_tty_inputs::{get_possible_tty_inputs, Bytes};
-use crate::tests::utils::commands::{QUIT, SLEEP};
-use interprocess::local_socket::LocalSocketStream;
use std::collections::{HashMap, VecDeque};
use std::io::Write;
use std::os::unix::io::RawFd;
use std::path::PathBuf;
use std::sync::{mpsc, Arc, Condvar, Mutex};
use std::time::{Duration, Instant};
+
+use zellij_utils::{nix, zellij_tile};
+
+use crate::tests::possible_tty_inputs::{get_possible_tty_inputs, Bytes};
+use crate::tests::utils::commands::{QUIT, SLEEP};
use zellij_client::os_input_output::ClientOsApi;
use zellij_server::os_input_output::ServerOsApi;
use zellij_tile::data::Palette;
use zellij_utils::{
channels::{ChannelWithContext, SenderType, SenderWithContext},
errors::ErrorContext,
+ interprocess::local_socket::LocalSocketStream,
ipc::{ClientToServerMsg, ServerToClientMsg},
pane_size::PositionAndSize,
shared::default_palette,
diff --git a/src/tests/utils.rs b/src/tests/utils.rs
index 441f9bcea..6267c883a 100644
--- a/src/tests/utils.rs
+++ b/src/tests/utils.rs
@@ -1,3 +1,5 @@
+use zellij_utils::{vte, zellij_tile};
+
use zellij_server::{panes::TerminalPane, tab::Pane};
use zellij_tile::data::Palette;
use zellij_utils::pane_size::PositionAndSize;