pogmommy/zellij
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build: Don't use default features (#4086)

Browse source 
* chore: Cut down dependency features

and reduce the impact of future changes to crate `default-feature`
changes. Also reduce a few transient dependencies which were previously
pulled in by crate features we aren't using.

* deps(utils): Remove `once_cell` dependency.

* deps: Remove more dependency features.

* deps: Remove remaining default features.

* docs: Update Changelog with PR #4086.

* style: Apply rustfmt.
This commit is contained in:
har7an 2025-03-22 13:40:37 +00:00 • committed by GitHub
parent 25e5f551c0
commit a2ae82259c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 79 additions and 200 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -7,6 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
## [Unreleased] ## [Unreleased]
* refactor(terminal): track scroll_region as tuple rather than Option (https://github.com/zellij-org/zellij/pull/4082) * refactor(terminal): track scroll_region as tuple rather than Option (https://github.com/zellij-org/zellij/pull/4082)
* chore(deps): Use workspace dependencies (https://github.com/zellij-org/zellij/pull/4085) * chore(deps): Use workspace dependencies (https://github.com/zellij-org/zellij/pull/4085)
* build: Don't use default features (https://github.com/zellij-org/zellij/pull/4086)
## [0.42.1] - 2025-03-21 ## [0.42.1] - 2025-03-21
* fix(mouse): fix mouse handling in windows terminal (https://github.com/zellij-org/zellij/pull/4076) * fix(mouse): fix mouse handling in windows terminal (https://github.com/zellij-org/zellij/pull/4076)

118
Cargo.lock generated
View file

@ -1005,12 +1005,6 @@ dependencies = [
"syn 1.0.96", "syn 1.0.96",
] ]
[[package]]
name = "destructure_traitobject"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c877555693c14d2f84191cfd3ad8582790fc52b5e2274b40b59cf5f5cea25c7"
[[package]] [[package]]
name = "dialoguer" name = "dialoguer"
version = "0.10.4" version = "0.10.4"
@ -1019,8 +1013,6 @@ checksum = "59c6f2989294b9a498d3ad5491a79c6deb604617378e1cdc4bfc1c1361fe2f87"
dependencies = [ dependencies = [
"console", "console",
"shell-words", "shell-words",
"tempfile",
"zeroize",
] ]
[[package]] [[package]]
@ -1322,7 +1314,6 @@ checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40"
dependencies = [ dependencies = [
"futures-channel", "futures-channel",
"futures-core", "futures-core",
"futures-executor",
"futures-io", "futures-io",
"futures-sink", "futures-sink",
"futures-task", "futures-task",
@ -1345,17 +1336,6 @@ version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
[[package]]
name = "futures-executor"
version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0"
dependencies = [
"futures-core",
"futures-task",
"futures-util",
]
[[package]] [[package]]
name = "futures-io" name = "futures-io"
version = "0.3.28" version = "0.3.28"
@ -1377,17 +1357,6 @@ dependencies = [
"waker-fn", "waker-fn",
] ]
[[package]]
name = "futures-macro"
version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.96",
]
[[package]] [[package]]
name = "futures-sink" name = "futures-sink"
version = "0.3.28" version = "0.3.28"
@ -1406,16 +1375,11 @@ version = "0.3.28"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
dependencies = [ dependencies = [
"futures-channel",
"futures-core", "futures-core",
"futures-io",
"futures-macro",
"futures-sink", "futures-sink",
"futures-task", "futures-task",
"memchr",
"pin-project-lite", "pin-project-lite",
"pin-utils", "pin-utils",
"slab",
] ]
[[package]] [[package]]
@ -1779,26 +1743,13 @@ version = "1.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "81f2533f3be42fffe3b5e63b71aeca416c1c3bc33e4e27be018521e76b1f38fb" checksum = "81f2533f3be42fffe3b5e63b71aeca416c1c3bc33e4e27be018521e76b1f38fb"
dependencies = [ dependencies = [
"blocking",
"cfg-if", "cfg-if",
"futures-core",
"futures-io",
"intmap",
"libc", "libc",
"once_cell",
"rustc_version", "rustc_version",
"spinning",
"thiserror 1.0.61",
"to_method", "to_method",
"winapi", "winapi",
] ]
[[package]]
name = "intmap"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ae52f28f45ac2bc96edb7714de995cffc174a395fb0abf5bff453587c980d7b9"
[[package]] [[package]]
name = "inventory" name = "inventory"
version = "0.2.3" version = "0.2.3"
@ -2096,7 +2047,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
dependencies = [ dependencies = [
"cfg-if", "cfg-if",
"serde",
"value-bag", "value-bag",
] ]
@ -2117,19 +2067,11 @@ dependencies = [
"chrono", "chrono",
"derivative", "derivative",
"fnv", "fnv",
"humantime",
"libc",
"log", "log",
"log-mdc", "log-mdc",
"parking_lot 0.12.1", "parking_lot 0.12.1",
"serde",
"serde-value",
"serde_json",
"serde_yaml",
"thiserror 1.0.61", "thiserror 1.0.61",
"thread-id", "thread-id",
"typemap-ors",
"winapi",
] ]
[[package]] [[package]]
@ -2358,7 +2300,6 @@ version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f4812c1eb49be776fb8df4961623bdc01ec9dfdc1abe8211ceb09150a2e64219" checksum = "f4812c1eb49be776fb8df4961623bdc01ec9dfdc1abe8211ceb09150a2e64219"
dependencies = [ dependencies = [
"crossbeam-channel",
"file-id", "file-id",
"notify", "notify",
"parking_lot 0.12.1", "parking_lot 0.12.1",
@ -2465,15 +2406,6 @@ version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
[[package]]
name = "ordered-float"
version = "2.10.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7940cf2ca942593318d07fcf2596cdca60a85c9e7fab408a5e21a4f9dcd40d87"
dependencies = [
"num-traits",
]
[[package]] [[package]]
name = "ordered-float" name = "ordered-float"
version = "4.2.0" version = "4.2.0"
@ -3165,16 +3097,6 @@ dependencies = [
"serde_derive", "serde_derive",
] ]
[[package]]
name = "serde-value"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f3a1a3341211875ef120e117ea7fd5228530ae7e7036a779fdc9117be6b3282c"
dependencies = [
"ordered-float 2.10.0",
"serde",
]
[[package]] [[package]]
name = "serde_derive" name = "serde_derive"
version = "1.0.217" version = "1.0.217"
@ -3374,15 +3296,6 @@ dependencies = [
"windows-sys 0.52.0", "windows-sys 0.52.0",
] ]
[[package]]
name = "spinning"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2d4f0e86297cad2658d92a707320d87bf4e6ae1050287f51d19b67ef3f153a7b"
dependencies = [
"lock_api",
]
[[package]] [[package]]
name = "sptr" name = "sptr"
version = "0.3.2" version = "0.3.2"
@ -3550,7 +3463,6 @@ dependencies = [
"libc", "libc",
"ntapi", "ntapi",
"once_cell", "once_cell",
"rayon",
"winapi", "winapi",
] ]
@ -3660,7 +3572,7 @@ dependencies = [
"nix 0.29.0", "nix 0.29.0",
"num-derive", "num-derive",
"num-traits", "num-traits",
"ordered-float 4.2.0", "ordered-float",
"pest", "pest",
"pest_derive", "pest_derive",
"phf", "phf",
@ -3887,15 +3799,6 @@ dependencies = [
"syn 2.0.96", "syn 2.0.96",
] ]
[[package]]
name = "typemap-ors"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a68c24b707f02dd18f1e4ccceb9d49f2058c2fb86384ef9972592904d7a28867"
dependencies = [
"unsafe-any-ors",
]
[[package]] [[package]]
name = "typenum" name = "typenum"
version = "1.15.0" version = "1.15.0"
@ -3986,15 +3889,6 @@ version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
[[package]]
name = "unsafe-any-ors"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e0a303d30665362d9680d7d91d78b23f5f899504d4f08b3c4cf08d055d87c0ad"
dependencies = [
"destructure_traitobject",
]
[[package]] [[package]]
name = "url" name = "url"
version = "2.5.0" version = "2.5.0"
@ -4614,7 +4508,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5f2ab60e120fd6eaa68d9567f3226e876684639d22a4219b313ff69ec0ccd5ac" checksum = "5f2ab60e120fd6eaa68d9567f3226e876684639d22a4219b313ff69ec0ccd5ac"
dependencies = [ dependencies = [
"log", "log",
"ordered-float 4.2.0", "ordered-float",
"strsim 0.11.1", "strsim 0.11.1",
"thiserror 1.0.61", "thiserror 1.0.61",
"wezterm-dynamic-derive", "wezterm-dynamic-derive",
@ -5178,7 +5072,6 @@ dependencies = [
"curl-sys", "curl-sys",
"directories", "directories",
"expect-test", "expect-test",
"futures",
"humantime", "humantime",
"include_dir", "include_dir",
"insta", "insta",
@ -5192,7 +5085,6 @@ dependencies = [
"miette", "miette",
"nix 0.23.1", "nix 0.23.1",
"notify-debouncer-full", "notify-debouncer-full",
"once_cell",
"openssl-sys", "openssl-sys",
"percent-encoding", "percent-encoding",
"prost", "prost",
@ -5255,12 +5147,6 @@ dependencies = [
"syn 2.0.96", "syn 2.0.96",
] ]
[[package]]
name = "zeroize"
version = "1.5.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "94693807d016b2f2d2e14420eb3bfcca689311ff775dcf113d74ea624b7cdf07"
[[package]] [[package]]
name = "zstd" name = "zstd"
version = "0.13.1" version = "0.13.1"

28
Cargo.toml
View file

@ -17,10 +17,10 @@ rust-version = "1.84"
zellij-client = { path = "zellij-client/", version = "0.43.0" } zellij-client = { path = "zellij-client/", version = "0.43.0" }
zellij-server = { path = "zellij-server/", version = "0.43.0" } zellij-server = { path = "zellij-server/", version = "0.43.0" }
zellij-utils = { workspace = true } zellij-utils = { workspace = true }
dialoguer = "0.10.4" dialoguer = { version = "0.10.4", default-features = false }
log = { workspace = true } log = { workspace = true }
names = { version = "0.14.0", default-features = false } names = { version = "0.14.0", default-features = false }
suggest = "0.4.0" suggest = { version = "0.4.0", default-features = false }
thiserror = { workspace = true } thiserror = { workspace = true }
[dev-dependencies] [dev-dependencies]
@ -50,18 +50,18 @@ members = [
] ]
[workspace.dependencies] [workspace.dependencies]
ansi_term = "0.12.1" ansi_term = { version = "0.12.1", default-features = false }
anyhow = { version = "1.0.70", features = ["backtrace"] } anyhow = { version = "1.0.70", default-features = false, features = ["backtrace", "std"] }
clap = { version = "3.2.2", features = ["derive", "env"] } clap = { version = "3.2.2", default-features = false, features = ["env", "derive", "color", "std", "suggestions"] }
log = "0.4.17" log = { version = "0.4.17", default-features = false }
serde = { version = "1.0", features = ["derive"] } serde = { version = "1.0", default-features = false, features = ["derive", "std"] }
serde_json = "1.0" serde_json = { version = "1.0", default-features = false, features = ["std"] }
strum = "0.20.0" strum = { version = "0.20.0", default-features = false }
strum_macros = "0.20.0" strum_macros = { version = "0.20.0", default-features = false }
thiserror = "1.0.40" thiserror = { version = "1.0.40", default-features = false }
unicode-width = "0.1.8" unicode-width = { version = "0.1.8", default-features = false }
url = { version = "2.2.2", features = ["serde"] } url = { version = "2.2.2", default-features = false, features = ["serde"] }
uuid = { version = "1.4.1", features = ["serde", "v4"] } uuid = { version = "1.4.1", default-features = false, features = ["serde", "v4", "std"] }
zellij-utils = { path = "zellij-utils/", version = "0.43.0" } zellij-utils = { path = "zellij-utils/", version = "0.43.0" }
[profile.dev-opt] [profile.dev-opt]

10
xtask/Cargo.toml
View file

@ -6,13 +6,13 @@ edition = "2021"
[dependencies] [dependencies]
anyhow = { workspace = true } anyhow = { workspace = true }
prost-build = "0.11.9" prost-build = { version = "0.11.9", default-features = false }
toml = "0.5" toml = { version = "0.5", default-features = false }
which = "4.2" which = { version = "4.2", default-features = false }
xflags = "0.3.2" xflags = { version = "0.3.2", default-features = false }
# TODO(hartan): Update this once we get a new release. See: # TODO(hartan): Update this once we get a new release. See:
# <https://github.com/matklad/xshell/issues/63> # <https://github.com/matklad/xshell/issues/63>
xshell = "= 0.2.2" xshell = { version = "= 0.2.2", default-features = false }
[lints.rust] [lints.rust]
# Only required because we need to fix `xshell` to `=0.2.2` # Only required because we need to fix `xshell` to `=0.2.2`

4
zellij-client/Cargo.toml
View file

@ -10,10 +10,10 @@ license = "MIT"
[dependencies] [dependencies]
log = { workspace = true } log = { workspace = true }
mio = { version = "0.7.11", features = ['os-ext'] } mio = { version = "0.7.11", default-features = false, features = ['os-ext'] }
serde = { workspace = true } serde = { workspace = true }
serde_json = { workspace = true } serde_json = { workspace = true }
serde_yaml = "0.8" serde_yaml = { version = "0.8", default-features = false }
url = { workspace = true } url = { workspace = true }
zellij-utils = { workspace = true } zellij-utils = { workspace = true }

45
zellij-server/Cargo.toml
View file

@ -10,44 +10,41 @@ license = "MIT"
[dependencies] [dependencies]
ansi_term = { workspace = true } ansi_term = { workspace = true }
arrayvec = "0.7.2" arrayvec = { version = "0.7.2", default-features = false, features = ["std"] }
async-trait = "0.1.50" async-trait = { version = "0.1.50", default-features = false }
base64 = "0.13.0" base64 = { version = "0.13.0", default-features = false, features = ["std"] }
byteorder = "1.4.3" byteorder = { version = "1.4.3", default-features = false, features = ["std"] }
bytes = "1.6.0" bytes = { version = "1.6.0", default-features = false, features = ["std"] }
cassowary = "0.3.0" cassowary = { version = "0.3.0", default-features = false }
chrono = "0.4.19" chrono = { version = "0.4.19", default-features = false, features = ["std", "clock"] }
close_fds = "0.3.2" close_fds = { version = "0.3.2", default-features = false }
daemonize = "0.5" daemonize = { version = "0.5", default-features = false }
highway = "0.6.4" highway = { version = "0.6.4", default-features = false, features = ["std"] }
log = { workspace = true } log = { workspace = true }
semver = "0.11.0" semver = { version = "0.11.0", default-features = false }
serde_json = { workspace = true } serde_json = { workspace = true }
sixel-image = "0.1.0" sixel-image = { version = "0.1.0", default-features = false }
sixel-tokenizer = "0.1.0" sixel-tokenizer = { version = "0.1.0", default-features = false }
sysinfo = "0.22.5" sysinfo = { version = "0.22.5", default-features = false }
typetag = "0.1.7" typetag = { version = "0.1.7", default-features = false }
unicode-width = { workspace = true } unicode-width = { workspace = true }
url = { workspace = true } url = { workspace = true }
uuid = { workspace = true } uuid = { workspace = true }
wasmtime-wasi = "29.0.1" # Keep in sync with wasmtime wasmtime-wasi = { version = "29.0.1", default-features = false, features = ["preview1"] } # Keep in sync with wasmtime
zellij-utils = { workspace = true } zellij-utils = { workspace = true }
[dependencies.wasmtime] [dependencies.wasmtime]
version = "29.0.1" # Keep in sync with wasmtime-wasi version = "29.0.1" # Keep in sync with wasmtime-wasi
default-features = false default-features = false
features = [ features = [
'async', 'addr2line',
'cache',
'parallel-compilation',
'cranelift', 'cranelift',
'demangle', 'demangle',
'addr2line',
'debug-builtins',
'runtime',
'component-model',
'std',
'gc', 'gc',
'gc-drc', 'gc-drc',
'parallel-compilation',
'runtime',
'std',
] ]
[dev-dependencies] [dev-dependencies]

3
zellij-server/src/logging_pipe.rs
View file

@ -4,7 +4,6 @@ use crate::plugins::PluginId;
use log::{debug, error}; use log::{debug, error};
use zellij_utils::{errors::prelude::*, serde}; use zellij_utils::{errors::prelude::*, serde};
use chrono::prelude::*;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
// 16kB log buffer // 16kB log buffer
@ -30,7 +29,7 @@ impl LoggingPipe {
debug!( debug!(
"|{:<25.25}| {} [{:<10.15}] {}", "|{:<25.25}| {} [{:<10.15}] {}",
self.plugin_name, self.plugin_name,
Local::now().format("%Y-%m-%d %H:%M:%S.%3f"), chrono::Local::now().format("%Y-%m-%d %H:%M:%S.%3f"),
format!("id: {}", self.plugin_id), format!("id: {}", self.plugin_id),
message message
); );

63
zellij-utils/Cargo.toml
View file

@ -11,53 +11,50 @@ include = ["src/**/*", "assets/"]
[dependencies] [dependencies]
anyhow = { workspace = true } anyhow = { workspace = true }
async-channel = "1.8.0" async-channel = { version = "1.8.0", default-features = false }
backtrace = "0.3.55" backtrace = { version = "0.3.55", default-features = false, features = ["std"] }
bitflags = "2.5.0" bitflags = { version = "2.5.0", default-features = false }
clap = { workspace = true } clap = { workspace = true }
clap_complete = "3.2.1" clap_complete = { version = "3.2.1", default-features = false }
colored = "2.0.0" colored = { version = "2.0.0", default-features = false }
colorsys = "0.6.5" colorsys = { version = "0.6.5", default-features = false, features = ["std"] }
crossbeam = "0.8.1" crossbeam = { version = "0.8.1", default-features = false, features = ["alloc", "std"] }
directories = "5.0" directories = { version = "5.0", default-features = false }
include_dir = "0.7.3" include_dir = { version = "0.7.3", default-features = false }
kdl = { version = "4.5.0", features = ["span"] } kdl = { version = "4.5.0", default-features = false, features = ["span"] }
lazy_static = "1.4.0" lazy_static = { version = "1.4.0", default-features = false }
libc = "0.2" libc = { version = "0.2", default-features = false, features = ["std"] }
log = { workspace = true } log = { workspace = true }
miette = { version = "5.7.0", features = ["fancy"] } miette = { version = "5.7.0", default-features = false, features = ["fancy"] }
nix = "0.23.1" nix = { version = "0.23.1", default-features = false }
once_cell = "1.8.0" percent-encoding = { version = "2.1.0", default-features = false, features = ["std"] }
percent-encoding = "2.1.0" prost = { version = "0.11.9", default-features = false, features = ["std", "prost-derive"] }
prost = "0.11.9" regex = { version = "1.5.5", default-features = false, features = ["perf", "std"] }
regex = "1.5.5" rmp-serde = { version = "1.1.0", default-features = false }
rmp-serde = "1.1.0"
serde = { workspace = true } serde = { workspace = true }
serde_json = { workspace = true } serde_json = { workspace = true }
shellexpand = "3.0.0" shellexpand = { version = "3.0.0", default-features = false, features = ["base-0", "tilde"] }
strip-ansi-escapes = "0.1.0" strip-ansi-escapes = { version = "0.1.0", default-features = false }
strum = { workspace = true } strum = { workspace = true }
strum_macros = { workspace = true } strum_macros = { workspace = true }
tempfile = "3.2.0" tempfile = { version = "3.2.0", default-features = false }
thiserror = { workspace = true } thiserror = { workspace = true }
unicode-width = { workspace = true } unicode-width = { workspace = true }
url = { workspace = true } url = { workspace = true }
uuid = { workspace = true } uuid = { workspace = true }
vte = { version = "0.11.0", default-features = false } vte = { version = "0.11.0", default-features = false }
#[cfg(not(target_family = "wasm"))]
[target.'cfg(not(target_family = "wasm"))'.dependencies] [target.'cfg(not(target_family = "wasm"))'.dependencies]
termwiz = "0.23.2" termwiz = { version = "0.23.2", default-features = false }
log4rs = "1.2.0" log4rs = { version = "1.2.0", default-features = false, features = ["pattern_encoder", "rolling_file_appender", "compound_policy", "fixed_window_roller", "size_trigger"] }
signal-hook = "0.3" notify-debouncer-full = { version = "0.1.0", default-features = false }
interprocess = "1.2.1" signal-hook = { version = "0.3", default-features = false, features = ["iterator"] }
async-std = { version = "1.3.0", features = ["unstable", "attributes"] } interprocess = { version = "1.2.1", default-features = false }
notify-debouncer-full = "0.1.0" async-std = { version = "1.3.0", default-features = false, features = ["attributes", "default", "std", "unstable"] }
humantime = "2.1.0" humantime = { version = "2.1.0", default-features = false }
futures = "0.3.28" openssl-sys = { version = "0.9.93", default-features = false, features = ["vendored"], optional = true }
openssl-sys = { version = "0.9.93", features = ["vendored"], optional = true }
isahc = { version = "1.7.2", default-features = false, features = ["http2", "text-decoding"] } isahc = { version = "1.7.2", default-features = false, features = ["http2", "text-decoding"] }
curl-sys = { version = "0.4", features = ["force-system-lib-on-osx"], optional = true } curl-sys = { version = "0.4", default-features = false, features = ["force-system-lib-on-osx", "ssl"], optional = true }
[dev-dependencies] [dev-dependencies]
insta = { version = "1.6.0", features = ["backtrace"] } insta = { version = "1.6.0", features = ["backtrace"] }

7
zellij-utils/src/consts.rs
View file

@ -4,8 +4,7 @@ use crate::home::find_default_config_dir;
use directories::ProjectDirs; use directories::ProjectDirs;
use include_dir::{include_dir, Dir}; use include_dir::{include_dir, Dir};
use lazy_static::lazy_static; use lazy_static::lazy_static;
use once_cell::sync::OnceCell; use std::{path::PathBuf, sync::OnceLock};
use std::path::PathBuf;
use uuid::Uuid; use uuid::Uuid;
pub const ZELLIJ_CONFIG_FILE_ENV: &str = "ZELLIJ_CONFIG_FILE"; pub const ZELLIJ_CONFIG_FILE_ENV: &str = "ZELLIJ_CONFIG_FILE";
@ -13,8 +12,8 @@ pub const ZELLIJ_CONFIG_DIR_ENV: &str = "ZELLIJ_CONFIG_DIR";
pub const ZELLIJ_LAYOUT_DIR_ENV: &str = "ZELLIJ_LAYOUT_DIR"; pub const ZELLIJ_LAYOUT_DIR_ENV: &str = "ZELLIJ_LAYOUT_DIR";
pub const VERSION: &str = env!("CARGO_PKG_VERSION"); pub const VERSION: &str = env!("CARGO_PKG_VERSION");
pub const DEFAULT_SCROLL_BUFFER_SIZE: usize = 10_000; pub const DEFAULT_SCROLL_BUFFER_SIZE: usize = 10_000;
pub static SCROLL_BUFFER_SIZE: OnceCell<usize> = OnceCell::new(); pub static SCROLL_BUFFER_SIZE: OnceLock<usize> = OnceLock::new();
pub static DEBUG_MODE: OnceCell<bool> = OnceCell::new(); pub static DEBUG_MODE: OnceLock<bool> = OnceLock::new();
pub const SYSTEM_DEFAULT_CONFIG_DIR: &str = "/etc/zellij"; pub const SYSTEM_DEFAULT_CONFIG_DIR: &str = "/etc/zellij";
pub const SYSTEM_DEFAULT_DATA_DIR_PREFIX: &str = system_default_data_dir(); pub const SYSTEM_DEFAULT_DATA_DIR_PREFIX: &str = system_default_data_dir();