diff options
| author | divens <divens@users.noreply.github.com> | 2026-02-23 16:40:51 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-02-23 16:40:51 +0100 |
| commit | c80786f4ff54d2df7cb826f4cb9ed766e8f42bf4 (patch) | |
| tree | 0f6bbcbc0cf572175b73a193443f1ba24b70019e /Cargo.lock | |
| parent | docs(changelog): preserve cwd for editor panes (diff) | |
| download | sl0ppij-c80786f4ff54d2df7cb826f4cb9ed766e8f42bf4.tar.gz sl0ppij-c80786f4ff54d2df7cb826f4cb9ed766e8f42bf4.tar.xz sl0ppij-c80786f4ff54d2df7cb826f4cb9ed766e8f42bf4.zip | |
[Windows port PR7] refactor: upgrade sysinfo and add cross-compilation proof (#4759)
* refactor: platform-abstract path constants
Add #[cfg(not(unix))] counterpart to unix_only module in consts.rs so
path constants compile on non-Unix platforms. Move nix dependency to
cfg(unix)-only in both zellij-utils and root crate.
* refactor: Windows cross-compilation proof
Enable all 5 core crates to compile for x86_64-pc-windows-gnu by fixing
dependency issues and upgrading sysinfo. This validates that PRs 1.1–7.1
correctly gated all Unix-specific code behind cfg attributes.
- Enable crossterm "windows" feature in workspace deps (no-op on non-Windows)
- Remove dead mio dependency from zellij-client (zero imports)
- Add Windows cross-compilation linker config to .cargo/config.toml
- Upgrade sysinfo 0.22.5 → 0.33 (drops ntapi v0.3.7 packed struct UB)
- Remove deprecated ProcessExt/SystemExt trait imports
- Pid::from(i32) → Pid::from_u32(u32)
- process.cwd() now returns Option<&Path>
- process.cmd() now returns &[OsString]
- Use precise ProcessRefreshKind (nothing + with_cwd/with_cmd)
---------
Co-authored-by: divens <divens.dev@gmail.com>
Diffstat (limited to 'Cargo.lock')
| -rw-r--r-- | Cargo.lock | 84 |
1 files changed, 73 insertions, 11 deletions
@@ -712,9 +712,9 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.3" +version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" [[package]] name = "cpufeatures" @@ -800,8 +800,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6" dependencies = [ "bitflags 2.5.0", + "crossterm_winapi", "parking_lot 0.12.1", "rustix 0.38.44", + "winapi", +] + +[[package]] +name = "crossterm_winapi" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" +dependencies = [ + "winapi", ] [[package]] @@ -1640,7 +1651,7 @@ dependencies = [ "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core", + "windows-core 0.52.0", ] [[package]] @@ -2465,9 +2476,9 @@ dependencies = [ [[package]] name = "ntapi" -version = "0.3.7" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28774a7fd2fbb4f0babd8237ce554b73af68021b5f695a3cebd6c59bac0980f" +checksum = "c70f219e21142367c70c0b30c6a9e3a14d55b4d12a204d897fbec83a0363f081" dependencies = [ "winapi", ] @@ -3789,16 +3800,15 @@ dependencies = [ [[package]] name = "sysinfo" -version = "0.22.5" +version = "0.33.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f1bfab07306a27332451a662ca9c8156e3a9986f82660ba9c8e744fe8455d43" +checksum = "4fc858248ea01b66f19d8e8a6d55f41deaf91e9d495246fd01368d99935c6c01" dependencies = [ - "cfg-if", "core-foundation-sys", "libc", + "memchr", "ntapi", - "once_cell", - "winapi", + "windows", ] [[package]] @@ -4839,6 +4849,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] +name = "windows" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143" +dependencies = [ + "windows-core 0.57.0", + "windows-targets 0.52.6", +] + +[[package]] name = "windows-core" version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -4848,6 +4868,49 @@ dependencies = [ ] [[package]] +name = "windows-core" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-result", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-implement" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", +] + +[[package]] +name = "windows-interface" +version = "0.57.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.96", +] + +[[package]] +name = "windows-result" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] name = "windows-sys" version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -5153,7 +5216,6 @@ dependencies = [ "isahc", "lazy_static", "log", - "mio 0.8.11", "nix 0.23.1", "notify", "num_cpus", |
