aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorhar7an <99636919+har7an@users.noreply.github.com>2025-03-23 10:03:42 +0000
committerGitHub <noreply@github.com>2025-03-23 10:03:42 +0000
commit6be8c495bcbdc2aa4fd4d6528b213ca8b6189b34 (patch)
tree5df14ebd014407f087cb8b5d46c4f0f44a5b3908 /src
parentbuild: Don't use default features (#4086) (diff)
downloadsl0ppij-6be8c495bcbdc2aa4fd4d6528b213ca8b6189b34.tar.gz
sl0ppij-6be8c495bcbdc2aa4fd4d6528b213ca8b6189b34.tar.xz
sl0ppij-6be8c495bcbdc2aa4fd4d6528b213ca8b6189b34.zip
build: Don't re-export foreign crates in utils (#4087)
* build(utils): Don't use reexported dependency for internal code, but use the dependency directly. * build(client): Don't use re-exports from `utils` but turn `zellij-utils` dependencies into shared workspace dependencies instead and specify those in `Cargo.toml` explicitly. This gives a much better overview of what component in zellij uses which crates. The previous approach hides a lot of this information since it looks like crates are used in a single place where this isn't actually true. * deps(tile): Don't use re-exports from zellij-utils. * build(zellij): Don't use re-exports from zellij-utils. * build(server): Don't use re-exports from zellij-utils. * build(utils): Don't re-export foreign crates. * docs: Update Changelog with PR #4087. * style: Apply rustfmt. * style: Apply rustfmt. * build(e2e): Don't use re-export from zellij-utils. * test: Restore e2e tests. * style: Apply more formatting.
Diffstat (limited to 'src')
-rw-r--r--src/commands.rs4
-rw-r--r--src/main.rs2
-rw-r--r--src/sessions.rs6
-rw-r--r--src/tests/e2e/remote_runner.rs2
4 files changed, 7 insertions, 7 deletions
diff --git a/src/commands.rs b/src/commands.rs
index dba2c9d7..e01d5176 100644
--- a/src/commands.rs
+++ b/src/commands.rs
@@ -9,6 +9,8 @@ use crate::sessions::{
print_sessions_with_index, resurrection_layout, session_exists, ActiveSession,
SessionNameMatch,
};
+use miette::{Report, Result};
+use nix;
use zellij_client::{
old_config_converter::{
config_yaml_to_config_kdl, convert_old_yaml_files, layout_yaml_to_layout_kdl,
@@ -27,8 +29,6 @@ use zellij_utils::{
layout::Layout,
options::Options,
},
- miette::{Report, Result},
- nix,
setup::{find_default_config_dir, get_layout_dir, Setup},
};
diff --git a/src/main.rs b/src/main.rs
index b3a5ce96..10459786 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -3,8 +3,8 @@ mod sessions;
#[cfg(test)]
mod tests;
+use clap::Parser;
use zellij_utils::{
- clap::Parser,
cli::{CliAction, CliArgs, Command, Sessions},
consts::create_config_and_cache_folders,
envs,
diff --git a/src/sessions.rs b/src/sessions.rs
index 5f77e2ef..99c1036e 100644
--- a/src/sessions.rs
+++ b/src/sessions.rs
@@ -1,18 +1,18 @@
+use anyhow;
+use humantime::format_duration;
+use interprocess::local_socket::LocalSocketStream;
use std::collections::HashMap;
use std::os::unix::fs::FileTypeExt;
use std::time::{Duration, SystemTime};
use std::{fs, io, process};
use suggest::Suggest;
use zellij_utils::{
- anyhow,
consts::{
session_info_folder_for_session, session_layout_cache_file_name,
ZELLIJ_SESSION_INFO_CACHE_DIR, ZELLIJ_SOCK_DIR,
},
envs,
- humantime::format_duration,
input::layout::Layout,
- interprocess::local_socket::LocalSocketStream,
ipc::{ClientToServerMsg, IpcReceiverWithContext, IpcSenderWithContext, ServerToClientMsg},
};
diff --git a/src/tests/e2e/remote_runner.rs b/src/tests/e2e/remote_runner.rs
index b3d8b9ac..626007c4 100644
--- a/src/tests/e2e/remote_runner.rs
+++ b/src/tests/e2e/remote_runner.rs
@@ -2,11 +2,11 @@ use std::collections::HashMap;
use std::sync::atomic::{AtomicBool, Ordering};
use std::sync::{Arc, Mutex};
+use vte;
use zellij_server::panes::sixel::SixelImageStore;
use zellij_server::panes::{LinkHandler, TerminalPane};
use zellij_utils::data::{Palette, Style};
use zellij_utils::pane_size::{Dimension, PaneGeom, Size, SizeInPixels};
-use zellij_utils::vte;
use ssh2::Session;
use std::io::prelude::*;