diff options
author | Kunal Mohan <44079328+kunalmohan@users.noreply.github.com> | 2021-05-19 11:21:33 +0530 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-19 11:21:33 +0530 |
commit | b20ac47d689a13cc894c3a10838cb8c2247a6e42 (patch) | |
tree | e3f942bc4778ba882e24968524c068b555486a75 /src | |
parent | 68445af63feaf6ab53a240d046392be09ecf2f8b (diff) | |
parent | a351440c99c7fba4dd66329b2ae27301dec1f288 (diff) |
Merge pull request #522 from zellij-org/re-export-dependencies
Re-export common dependencies from zellij-utils
Diffstat (limited to 'src')
-rw-r--r-- | src/main.rs | 2 | ||||
-rw-r--r-- | src/tests/fakes.rs | 9 | ||||
-rw-r--r-- | src/tests/utils.rs | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/src/main.rs b/src/main.rs index b5dd213f7..a970ce446 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 44c0b2ce2..e9042ed73 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::{Pid, 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; |