diff options
author | Canop <cano.petrole@gmail.com> | 2023-10-14 19:07:35 +0200 |
---|---|---|
committer | Canop <cano.petrole@gmail.com> | 2023-10-14 20:03:08 +0200 |
commit | da415ea69c9ab20aacc8548f868cd10b8fb20754 (patch) | |
tree | b18a2346ebd94c417909529cc8ec59ca9a73df05 | |
parent | 0b4dafa94546a2ab9e132e5b3c631231ed023b3a (diff) |
version 2.8.2
-rw-r--r-- | CHANGELOG.md | 4 | ||||
-rw-r--r-- | Cargo.lock | 85 | ||||
-rw-r--r-- | Cargo.toml | 6 | ||||
-rw-r--r-- | build.rs | 8 | ||||
-rw-r--r-- | cli/Cargo.lock | 184 | ||||
-rw-r--r-- | cli/Cargo.toml | 16 | ||||
-rw-r--r-- | cli/src/args.rs | 2 | ||||
-rw-r--r-- | cli/src/table.rs | 2 |
8 files changed, 140 insertions, 167 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index c1875ab..7a6fdea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +<a name="v2.8.2"></a> +### v2.8.2 - 2023/10/14 +- cross-project dependency versions harmonization to ease vetting + <a name="v2.8.1"></a> ### v2.8.1 - 2023/10/09 - require rust 1.70 because that's what clap requires - Fix #69 @@ -12,6 +12,15 @@ dependencies = [ ] [[package]] +name = "ansi_colours" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a1558bd2075d341b9ca698ec8eb6fcc55a746b1fc4255585aad5b141d918a80" +dependencies = [ + "rgb", +] + +[[package]] name = "anstream" version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -78,6 +87,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] +name = "bytemuck" +version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" + +[[package]] name = "cc" version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -101,9 +116,9 @@ dependencies = [ [[package]] name = "clap-help" -version = "0.7.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "542031cd21cd56842924c779171af859783a04063e2ede297aa9fa0ffbb8a9b3" +checksum = "4b3a08fe055ca94ba53737ef3c876c5258cfead4162befe5f26b4070e01418cc" dependencies = [ "clap", "termimad", @@ -170,7 +185,14 @@ name = "coolor" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af4d7a805ca0d92f8c61a31c809d4323fdaa939b0b440e544d21db7797c5aaad" + +[[package]] +name = "coolor" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb59643927bb051e6c0ce8f0824dee73f07c63c5e06306053e4c35e468169182" dependencies = [ + "ansi_colours", "crossterm", ] @@ -274,7 +296,7 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" [[package]] name = "dysk" -version = "2.8.1" +version = "2.8.2" dependencies = [ "clap", "clap_complete", @@ -286,12 +308,11 @@ dependencies = [ [[package]] name = "dysk-cli" -version = "2.8.1" +version = "2.8.2" dependencies = [ "bet", "clap", "clap-help", - "crossterm", "file-size", "lfs-core", "serde", @@ -341,40 +362,17 @@ checksum = "4217ad341ebadf8d8e724e264f13e593e0648f5b3e94b3896a5df283be015ecc" [[package]] name = "lazy-regex" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae9656bf98b413727b974a451039bc00ce546c3de9440cb4a7b65222b71e17cc" -dependencies = [ - "lazy-regex-proc_macros 2.3.1", - "once_cell", - "regex", -] - -[[package]] -name = "lazy-regex" -version = "3.0.1" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57451d19ad5e289ff6c3d69c2a2424652995c42b79dafa11e9c4d5508c913c01" +checksum = "e723bd417b2df60a0f6a2b6825f297ea04b245d4ba52b5a22cb679bdf58b05fa" dependencies = [ - "lazy-regex-proc_macros 3.0.1", + "lazy-regex-proc_macros", "once_cell", "regex", ] [[package]] name = "lazy-regex-proc_macros" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da3c3042a5f73640f091fda4175798f2b51c2107deeab18e3017873a4772dd36" -dependencies = [ - "proc-macro2", - "quote", - "regex", - "syn 1.0.105", -] - -[[package]] -name = "lazy-regex-proc_macros" version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f0a1d9139f0ee2e862e08a9c5d0ba0470f2aa21cd1e1aa1b1562f83116c725f" @@ -387,11 +385,11 @@ dependencies = [ [[package]] name = "lfs-core" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c4441d37490f59d2fdc631e6be973ce8712435e4bfebe9615125b11603cd41f" +checksum = "75aa9f1a56e1178a04270bdd6f28b3a9cc34bc5429a3139cd03e2eae2ecb455a" dependencies = [ - "lazy-regex 2.3.1", + "lazy-regex", "libc", "snafu", ] @@ -565,6 +563,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] +name = "rgb" +version = "0.8.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "20ec2d3e3fc7a92ced357df9cebd5a10b6fb2aa1ee797bf7e9ce2f17dffc8f59" +dependencies = [ + "bytemuck", +] + +[[package]] name = "roff" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -710,14 +717,14 @@ dependencies = [ [[package]] name = "termimad" -version = "0.25.0" +version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29bffc8a18091227aeac7ccbf7ccc0359a4b7d4c0b53a4a7680050aae05a0b31" +checksum = "6b9d2967327d765fe6534b851fe7faa933858b2638152808da2de5b9ad7a43db" dependencies = [ - "coolor", + "coolor 0.6.1", "crossbeam", "crossterm", - "lazy-regex 3.0.1", + "lazy-regex", "minimad", "serde", "thiserror", @@ -730,7 +737,7 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9077b39afb70f12391e4c1fcf46319999cfc32b45d605a668052bc4d1b4511af" dependencies = [ - "coolor", + "coolor 0.5.0", "crossterm", "thiserror", "xterm-query", @@ -1,6 +1,6 @@ [package] name = "dysk" -version = "2.8.1" +version = "2.8.2" authors = ["dystroy <denys.seguret@gmail.com>"] edition = "2021" keywords = ["linux", "filesystem", "fs", "lfs", "disk"] @@ -16,13 +16,13 @@ exclude = ["website", "dysk*.zip"] build = "build.rs" [dependencies] -dysk-cli = { version = "2.8.1", path = "cli" } # beware: version is also in build dependencies +dysk-cli = { version = "2.8.2", path = "cli" } # beware: version is also in build dependencies [build-dependencies] clap = { version = "4.4", features = ["derive", "cargo"] } clap_complete = "4.4" clap_mangen = "0.2.12" -dysk-cli = { version = "2.8.1", path = "cli" } +dysk-cli = { version = "2.8.2", path = "cli" } serde = { version = "1.0", features = ["derive"] } toml = "0.7" @@ -89,10 +89,10 @@ fn check_version_consistency() -> std::io::Result<()> { }; let cli_cargo: CliCargo = toml::from_str(&s).unwrap(); let ok = - (&version == &main_cargo.package.version) - && (&version == &main_cargo.dependencies.dysk_cli.version) - && (&version == &main_cargo.build_dependencies.dysk_cli.version) - && (&version == &cli_cargo.package.version); + (version == main_cargo.package.version) + && (version == main_cargo.dependencies.dysk_cli.version) + && (version == main_cargo.build_dependencies.dysk_cli.version) + && (version == cli_cargo.package.version); if ok { eprintln!("Checked consistency of dysk and dysk-cli versions: OK"); } else { diff --git a/cli/Cargo.lock b/cli/Cargo.lock index db58a23..6765548 100644 --- a/cli/Cargo.lock +++ b/cli/Cargo.lock @@ -12,17 +12,25 @@ dependencies = [ ] [[package]] +name = "ansi_colours" +version = "1.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a1558bd2075d341b9ca698ec8eb6fcc55a746b1fc4255585aad5b141d918a80" +dependencies = [ + "rgb", +] + +[[package]] name = "anstream" -version = "0.3.2" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca84f3628370c59db74ee214b3263d58f9aadd9b4fe7e711fd87dc452b7f163" +checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", - "is-terminal", "utf8parse", ] @@ -52,9 +60,9 @@ dependencies = [ [[package]] name = "anstyle-wincon" -version = "1.0.1" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188" +checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" dependencies = [ "anstyle", "windows-sys", @@ -79,10 +87,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] -name = "bitflags" -version = "2.3.3" +name = "bytemuck" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630be753d4e58660abd17930c71b647fe46c27ea6b63cc59e1e3851406972e42" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" [[package]] name = "cc" @@ -101,44 +109,42 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "4.3.19" +version = "4.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd304a20bff958a57f04c4e96a2e7594cc4490a0e809cbd48bb6437edaa452d" +checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956" dependencies = [ "clap_builder", "clap_derive", - "once_cell", ] [[package]] name = "clap-help" -version = "0.6.2" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f06bd287cb07754f8337478ac48ce3737ddbcf729345a607338ffcdff0d908c" +checksum = "4b3a08fe055ca94ba53737ef3c876c5258cfead4162befe5f26b4070e01418cc" dependencies = [ "clap", - "termimad 0.23.2", + "termimad", "terminal-light", ] [[package]] name = "clap_builder" -version = "4.3.19" +version = "4.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01c6a3f08f1fe5662a35cfe393aec09c4df95f60ee93b7556505260f75eee9e1" +checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45" dependencies = [ "anstream", "anstyle", "clap_lex", - "once_cell", "strsim", ] [[package]] name = "clap_derive" -version = "4.3.12" +version = "4.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54a9bb5758fc5dfe728d1019941681eccaf0cf8a4189b692a0ee2f2ecf90a050" +checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873" dependencies = [ "heck", "proc-macro2", @@ -163,7 +169,14 @@ name = "coolor" version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af4d7a805ca0d92f8c61a31c809d4323fdaa939b0b440e544d21db7797c5aaad" + +[[package]] +name = "coolor" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb59643927bb051e6c0ce8f0824dee73f07c63c5e06306053e4c35e468169182" dependencies = [ + "ansi_colours", "crossterm", ] @@ -240,7 +253,7 @@ version = "0.23.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2102ea4f781910f8a5b98dd061f4c2023f479ce7bb1236330099ceb5a93cf17" dependencies = [ - "bitflags 1.3.2", + "bitflags", "crossterm_winapi", "libc", "mio", @@ -267,7 +280,7 @@ checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" [[package]] name = "dysk-cli" -version = "2.7.2" +version = "2.8.2" dependencies = [ "bet", "clap", @@ -277,28 +290,7 @@ dependencies = [ "lfs-core", "serde", "serde_json", - "termimad 0.20.6", -] - -[[package]] -name = "errno" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b30f669a7961ef1631673d2766cc92f52d64f7ef354d4fe0ddfd30ed52f0f4f" -dependencies = [ - "errno-dragonfly", - "libc", - "windows-sys", -] - -[[package]] -name = "errno-dragonfly" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" -dependencies = [ - "cc", - "libc", + "termimad", ] [[package]] @@ -314,23 +306,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] -name = "hermit-abi" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" - -[[package]] -name = "is-terminal" -version = "0.4.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b" -dependencies = [ - "hermit-abi", - "rustix", - "windows-sys", -] - -[[package]] name = "itoa" version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -338,9 +313,9 @@ checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "lazy-regex" -version = "2.5.0" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff63c423c68ea6814b7da9e88ce585f793c87ddd9e78f646970891769c8235d4" +checksum = "e723bd417b2df60a0f6a2b6825f297ea04b245d4ba52b5a22cb679bdf58b05fa" dependencies = [ "lazy-regex-proc_macros", "once_cell", @@ -349,21 +324,21 @@ dependencies = [ [[package]] name = "lazy-regex-proc_macros" -version = "2.4.1" +version = "3.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8edfc11b8f56ce85e207e62ea21557cfa09bb24a8f6b04ae181b086ff8611c22" +checksum = "0f0a1d9139f0ee2e862e08a9c5d0ba0470f2aa21cd1e1aa1b1562f83116c725f" dependencies = [ "proc-macro2", "quote", "regex", - "syn 1.0.109", + "syn 2.0.28", ] [[package]] name = "lfs-core" -version = "0.11.1" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c4441d37490f59d2fdc631e6be973ce8712435e4bfebe9615125b11603cd41f" +checksum = "75aa9f1a56e1178a04270bdd6f28b3a9cc34bc5429a3139cd03e2eae2ecb455a" dependencies = [ "lazy-regex", "libc", @@ -377,12 +352,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" [[package]] -name = "linux-raw-sys" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57bcfdad1b858c2db7c38303a6d2ad4dfaf5eb53dfeb0910128b2c26d6158503" - -[[package]] name = "lock_api" version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -424,18 +393,9 @@ dependencies = [ [[package]] name = "minimad" -version = "0.9.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "277639f0198568f70f8fe4ab88a52a67c96bca12f27ba5c17a76acdcb8b45834" -dependencies = [ - "once_cell", -] - -[[package]] -name = "minimad" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38b136454924e4d020e55c4992e07c105b40d5c41b84662862f0e15bc0a2efef" +checksum = "f6c4610f430e49b882fcaad0186134150d4d74fc76080b0a61f7000460c2e268" dependencies = [ "once_cell", ] @@ -458,7 +418,7 @@ version = "0.22.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e4916f159ed8e5de0082076562152a76b7a1f64a01fd9d1e0fea002c37624faf" dependencies = [ - "bitflags 1.3.2", + "bitflags", "cc", "cfg-if", "libc", @@ -518,7 +478,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags 1.3.2", + "bitflags", ] [[package]] @@ -551,16 +511,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] -name = "rustix" -version = "0.38.6" +name = "rgb" +version = "0.8.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee020b1716f0a80e2ace9b03441a749e402e86712f15f16fe8a8f75afac732f" +checksum = "20ec2d3e3fc7a92ced357df9cebd5a10b6fb2aa1ee797bf7e9ce2f17dffc8f59" dependencies = [ - "bitflags 2.3.3", - "errno", - "libc", - "linux-raw-sys", - "windows-sys", + "bytemuck", ] [[package]] @@ -580,6 +536,20 @@ name = "serde" version = "1.0.180" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0ea67f183f058fe88a4e3ec6e2788e003840893b91bac4559cabedd00863b3ed" +dependencies = [ + "serde_derive", +] + +[[package]] +name = "serde_derive" +version = "1.0.180" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24e744d7782b686ab3b73267ef05697159cc0e5abbed3f47f9933165e5219036" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.28", +] [[package]] name = "serde_json" @@ -680,28 +650,16 @@ dependencies = [ [[package]] name = "termimad" -version = "0.20.6" +version = "0.25.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfab44b4bc17601cf226cce31c87462a4a5bd5d325948c8ebbc9e715660a1287" +checksum = "6b9d2967327d765fe6534b851fe7faa933858b2638152808da2de5b9ad7a43db" dependencies = [ - "coolor", + "coolor 0.6.1", "crossbeam", "crossterm", - "minimad 0.9.1", - "thiserror", - "unicode-width", -] - -[[package]] -name = "termimad" -version = "0.23.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e32883199fc52cda7e431958dee8bc3ec6898afabc152b76959b9e0e74e2202" -dependencies = [ - "coolor", - "crossbeam", - "crossterm", - "minimad 0.12.0", + "lazy-regex", + "minimad", + "serde", "thiserror", "unicode-width", ] @@ -712,7 +670,7 @@ version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9077b39afb70f12391e4c1fcf46319999cfc32b45d605a668052bc4d1b4511af" dependencies = [ - "coolor", + "coolor 0.5.0", "crossterm", "thiserror", "xterm-query", diff --git a/cli/Cargo.toml b/cli/Cargo.toml index a067948..fb521a4 100644 --- a/cli/Cargo.toml +++ b/cli/Cargo.toml @@ -1,22 +1,26 @@ [package] name = "dysk-cli" -version = "2.8.1" +version = "2.8.2" authors = ["dystroy <denys.seguret@gmail.com>"] edition = "2021" license = "MIT" description = "the dysk cli as a library" rust-version = "1.70" +resolver = "1" [dependencies] -bet = "1.0.0" +bet = "1.0.2" clap = { version = "4.4", features = ["derive", "cargo"] } -clap-help = "0.7.0" -crossterm = "0.23.2" +clap-help = "1.0" file-size = "1.0.3" -lfs-core = "0.11.0" +lfs-core = "0.11.2" serde = "1.0" serde_json = "1.0" -termimad = "0.25.0" +termimad = "0.25.4" [profile.release] strip = true + +[patch.crates-io] +# termimad = { path = "../termimad" } + diff --git a/cli/src/args.rs b/cli/src/args.rs index f65eee1..ae4c0ec 100644 --- a/cli/src/args.rs +++ b/cli/src/args.rs @@ -6,7 +6,7 @@ use { sorting::Sorting, }, clap::{Parser, ValueEnum}, - crossterm::tty::IsTty, + termimad::crossterm::tty::IsTty, std::path::PathBuf, }; diff --git a/cli/src/table.rs b/cli/src/table.rs index 7a64163..2454e53 100644 --- a/cli/src/table.rs +++ b/cli/src/table.rs @@ -2,9 +2,9 @@ use { crate::{ Args, col::Col, }, - crossterm::style::Color::*, lfs_core::*, termimad::{ + crossterm::style::Color::*, minimad::{self, OwningTemplateExpander, TableBuilder}, CompoundStyle, MadSkin, ProgressBar, }, |