Merge 49b6e77d8d into 9483798459

fix: update rustix to fix the enable_raw_mode() error on WSL/Android
https://github.com/crossterm-rs/crossterm/pull/926#issuecomment-2334770989
2024-10-05 22:57:20 +03:00 · 2024-09-07 12:13:27 +05:30 · 2024-09-07 13:52:45 +08:00 · 2024-09-03 11:16:58 -07:00 · 2024-09-03 11:14:57 -07:00 · 2024-09-01 15:11:26 -07:00
9 changed files with 252 additions and 170 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@ -17,6 +17,12 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"

+[[package]]
+name = "adler2"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
+
 [[package]]
 name = "ahash"
 version = "0.8.11"
@ -119,9 +125,9 @@ dependencies = [

 [[package]]
 name = "anstyle-wincon"
-version = "3.0.3"
+version = "3.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19"
+checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
 dependencies = [
 "anstyle",
 "windows-sys 0.52.0",
@ -129,9 +135,9 @@ dependencies = [

 [[package]]
 name = "anyhow"
-version = "1.0.86"
+version = "1.0.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
+checksum = "10f00e1f6e58a40e807377c75c6a7f97bf9044fab57816f2414e6f5f4499d7b8"

 [[package]]
 name = "arbitrary"
@ -153,14 +159,14 @@ checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]

 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"

 [[package]]
 name = "async-priority-channel"
@ -210,17 +216,11 @@ dependencies = [
 "cc",
 "cfg-if",
 "libc",
- "miniz_oxide",
+ "miniz_oxide 0.7.4",
 "object",
 "rustc-demangle",
 ]

-[[package]]
-name = "base64"
-version = "0.21.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
-
 [[package]]
 name = "base64"
 version = "0.22.1"
@ -266,9 +266,9 @@ checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"

 [[package]]
 name = "bitstream-io"
-version = "2.5.0"
+version = "2.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dcde5f311c85b8ca30c2e4198d4326bc342c76541590106f5fa4a50946ea499"
+checksum = "b81e1519b0d82120d2fd469d5bfb2919a9361c48b02d82d04befc1cdd2002452"

 [[package]]
 name = "block-buffer"
@ -290,9 +290,9 @@ dependencies = [

 [[package]]
 name = "bstr"
-version = "1.9.1"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706"
+checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c"
 dependencies = [
 "memchr",
 "serde",
@ -312,9 +312,15 @@ checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"

 [[package]]
 name = "bytemuck"
-version = "1.16.1"
+version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e"
+checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae"
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"

 [[package]]
 name = "byteorder-lite"
@ -345,9 +351,9 @@ dependencies = [

 [[package]]
 name = "cc"
-version = "1.1.15"
+version = "1.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57b6a275aa2903740dc87da01c62040406b8812552e97129a63ea8850a17c6e6"
+checksum = "a93fe60e2fc87b6ba2c117f67ae14f66e3fc7d6a1e612a25adb238cc980eadb3"
 dependencies = [
 "jobserver",
 "libc",
@ -384,9 +390,9 @@ dependencies = [

 [[package]]
 name = "clap"
-version = "4.5.16"
+version = "4.5.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed6719fffa43d0d87e5fd8caeab59be1554fb028cd30edc88fc4369b17971019"
+checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac"
 dependencies = [
 "clap_builder",
 "clap_derive",
@ -394,9 +400,9 @@ dependencies = [

 [[package]]
 name = "clap_builder"
-version = "4.5.15"
+version = "4.5.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "216aec2b177652e3846684cbfe25c9964d18ec45234f0f5da5157b207ed1aab6"
+checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73"
 dependencies = [
 "anstream",
 "anstyle",
@ -406,9 +412,9 @@ dependencies = [

 [[package]]
 name = "clap_complete"
-version = "4.5.24"
+version = "4.5.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d7db6eca8c205649e8d3ccd05aa5042b1800a784e56bc7c43524fde8abbfa9b"
+checksum = "205d5ef6d485fa47606b98b0ddc4ead26eb850aaa86abfb562a94fb3280ecba0"
 dependencies = [
 "clap",
 ]
@ -442,7 +448,7 @@ dependencies = [
 "heck",
 "proc-macro2",
 "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]

 [[package]]
@ -509,9 +515,9 @@ dependencies = [

 [[package]]
 name = "core-foundation-sys"
-version = "0.8.6"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"

 [[package]]
 name = "crc32fast"
@ -602,9 +608,9 @@ dependencies = [

 [[package]]
 name = "darling"
-version = "0.20.9"
+version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1"
+checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989"
 dependencies = [
 "darling_core",
 "darling_macro",
@ -612,27 +618,27 @@ dependencies = [

 [[package]]
 name = "darling_core"
-version = "0.20.9"
+version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120"
+checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5"
 dependencies = [
 "fnv",
 "ident_case",
 "proc-macro2",
 "quote",
 "strsim",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]

 [[package]]
 name = "darling_macro"
-version = "0.20.9"
+version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178"
+checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
 "darling_core",
 "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]

 [[package]]
@ -646,33 +652,33 @@ dependencies = [

 [[package]]
 name = "derive_builder"
-version = "0.20.0"
+version = "0.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0350b5cb0331628a5916d6c5c0b72e97393b8b6b03b47a9284f4e7f5a405ffd7"
+checksum = "cd33f37ee6a119146a1781d3356a7c26028f83d779b2e04ecd45fdc75c76877b"
 dependencies = [
 "derive_builder_macro",
 ]

 [[package]]
 name = "derive_builder_core"
-version = "0.20.0"
+version = "0.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d48cda787f839151732d396ac69e3473923d54312c070ee21e9effcaa8ca0b1d"
+checksum = "7431fa049613920234f22c47fdc33e6cf3ee83067091ea4277a3f8c4587aae38"
 dependencies = [
 "darling",
 "proc-macro2",
 "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]

 [[package]]
 name = "derive_builder_macro"
-version = "0.20.0"
+version = "0.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "206868b8242f27cecce124c19fd88157fbd0dd334df2587f36417bafbc85097b"
+checksum = "4abae7035bf79b9877b779505d8cf3749285b80c43941eda66604841889451dc"
 dependencies = [
 "derive_builder_core",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]

 [[package]]
@ -771,7 +777,7 @@ dependencies = [
 "flume",
 "half",
 "lebe",
- "miniz_oxide",
+ "miniz_oxide 0.7.4",
 "rayon-core",
 "smallvec",
 "zune-inflate",
@ -809,24 +815,24 @@ dependencies = [

 [[package]]
 name = "filetime"
-version = "0.2.23"
+version = "0.2.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd"
+checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586"
 dependencies = [
 "cfg-if",
 "libc",
- "redox_syscall 0.4.1",
- "windows-sys 0.52.0",
+ "libredox",
+ "windows-sys 0.59.0",
 ]

 [[package]]
 name = "flate2"
-version = "1.0.30"
+version = "1.0.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"
+checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253"
 dependencies = [
 "crc32fast",
- "miniz_oxide",
+ "miniz_oxide 0.8.0",
 ]

 [[package]]
@ -918,7 +924,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]

 [[package]]
@ -1176,7 +1182,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b23a0c8dfe501baac4adf6ebbfa6eddf8f0c07f56b058cc1288017e32397846c"
 dependencies = [
 "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]

 [[package]]
@ -1196,7 +1202,7 @@ checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]

 [[package]]
@ -1246,9 +1252,9 @@ checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0"

 [[package]]
 name = "js-sys"
-version = "0.3.69"
+version = "0.3.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
+checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
 dependencies = [
 "wasm-bindgen",
 ]
@ -1319,14 +1325,9 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
 dependencies = [
 "bitflags 2.6.0",
 "libc",
+ "redox_syscall",
 ]

-[[package]]
-name = "line-wrap"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd1bc4d24ad230d21fb898d1116b1801d7adfc449d42026475862ab48b11e70e"
-
 [[package]]
 name = "linux-raw-sys"
 version = "0.4.14"
@ -1369,18 +1370,18 @@ dependencies = [

 [[package]]
 name = "lua-src"
-version = "546.0.2"
+version = "547.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2da0daa7eee611a4c30c8f5ee31af55266e26e573971ba9336d2993e2da129b2"
+checksum = "1edaf29e3517b49b8b746701e5648ccb5785cde1c119062cbabbc5d5cd115e42"
 dependencies = [
 "cc",
 ]

 [[package]]
 name = "luajit-src"
-version = "210.5.8+5790d25"
+version = "210.5.10+f725e44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "441f18d9ad792e871fc2f7f2cb8902c386f6f56fdbddef3b835b61475e375346"
+checksum = "18a0fa0df28e21f785c48d9c0f0be355cf40658badb667284207dbb4d1e574a9"
 dependencies = [
 "cc",
 "which",
@ -1427,6 +1428,15 @@ dependencies = [
 "simd-adler32",
 ]

+[[package]]
+name = "miniz_oxide"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
+dependencies = [
+ "adler2",
+]
+
 [[package]]
 name = "mio"
 version = "0.8.11"
@ -1472,9 +1482,9 @@ dependencies = [

 [[package]]
 name = "mlua-sys"
-version = "0.6.1"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a088ed0723df7567f569ba018c5d48c23c501f3878b190b04144dfa5ebfa8abc"
+checksum = "3ab7a5b4756b8177a2dfa8e0bbcde63bd4000afbc4ab20cbb68d114a25470f29"
 dependencies = [
 "cc",
 "cfg-if",
@ -1495,7 +1505,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "regex",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]

 [[package]]
@ -1588,7 +1598,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]

 [[package]]
@ -1665,9 +1675,9 @@ dependencies = [

 [[package]]
 name = "object"
-version = "0.36.1"
+version = "0.36.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce"
+checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a"
 dependencies = [
 "memchr",
 ]
@ -1745,7 +1755,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
 "cfg-if",
 "libc",
- "redox_syscall 0.5.2",
+ "redox_syscall",
 "smallvec",
 "windows-targets 0.52.6",
 ]
@ -1782,13 +1792,12 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"

 [[package]]
 name = "plist"
-version = "1.6.1"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9d34169e64b3c7a80c8621a48adaf44e0cf62c78a9b25dd9dd35f1881a17cf9"
+checksum = "42cf17e9a1800f5f396bc67d193dc9411b59012a5876445ef450d449881e1016"
 dependencies = [
- "base64 0.21.7",
+ "base64",
 "indexmap",
- "line-wrap",
 "quick-xml",
 "serde",
 "time",
@ -1804,7 +1813,7 @@ dependencies = [
 "crc32fast",
 "fdeflate",
 "flate2",
- "miniz_oxide",
+ "miniz_oxide 0.7.4",
 ]

 [[package]]
@ -1815,9 +1824,12 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"

 [[package]]
 name = "ppv-lite86"
-version = "0.2.17"
+version = "0.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+dependencies = [
+ "zerocopy",
+]

 [[package]]
 name = "proc-macro-error"
@ -1868,7 +1880,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd"
 dependencies = [
 "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]

 [[package]]
@ -1888,9 +1900,9 @@ checksum = "a993555f31e5a609f617c12db6250dedcac1b0a85076912c436e6fc9b2c8e6a3"

 [[package]]
 name = "quick-xml"
-version = "0.31.0"
+version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33"
+checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2"
 dependencies = [
 "memchr",
 ]
@ -1992,9 +2004,9 @@ dependencies = [

 [[package]]
 name = "ravif"
-version = "0.11.9"
+version = "0.11.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5797d09f9bd33604689e87e8380df4951d4912f01b63f71205e2abd4ae25e6b6"
+checksum = "a8f0bfd976333248de2078d350bfdf182ff96e168a24d23d2436cef320dd4bdd"
 dependencies = [
 "avif-serialize",
 "imgref",
@ -2026,27 +2038,18 @@ dependencies = [

 [[package]]
 name = "redox_syscall"
-version = "0.4.1"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
-dependencies = [
- "bitflags 1.3.2",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd"
+checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
 dependencies = [
 "bitflags 2.6.0",
 ]

 [[package]]
 name = "redox_users"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891"
+checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
 dependencies = [
 "getrandom",
 "libredox",
@ -2084,9 +2087,9 @@ checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"

 [[package]]
 name = "rgb"
-version = "0.8.45"
+version = "0.8.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ade4539f42266ded9e755c605bdddf546242b2c961b03b06a7375260788a0523"
+checksum = "57397d16646700483b67d2dd6511d79318f9d057fdbd21a4066aeac8b41d310a"
 dependencies = [
 "bytemuck",
 ]
@ -2105,9 +2108,9 @@ checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"

 [[package]]
 name = "rustix"
-version = "0.38.35"
+version = "0.38.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a85d50532239da68e9addb745ba38ff4612a242c1c7ceea689c4bc7c2f43c36f"
+checksum = "3f55e80d50763938498dd5ebb18647174e0c76dc38c5505294bb224624f30f36"
 dependencies = [
 "bitflags 2.6.0",
 "errno",
@ -2145,9 +2148,9 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"

 [[package]]
 name = "serde"
-version = "1.0.209"
+version = "1.0.210"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99fce0ffe7310761ca6bf9faf5115afbc19688edd00171d81b1bb1b116c63e09"
+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
 dependencies = [
 "serde_derive",
 ]
@ -2164,20 +2167,20 @@ dependencies = [

 [[package]]
 name = "serde_derive"
-version = "1.0.209"
+version = "1.0.210"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a5831b979fd7b5439637af1752d535ff49f4860c0f341d1baeb6faf0f4242170"
+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]

 [[package]]
 name = "serde_json"
-version = "1.0.127"
+version = "1.0.128"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad"
+checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
 dependencies = [
 "itoa",
 "memchr",
@ -2343,7 +2346,7 @@ dependencies = [
 "proc-macro2",
 "quote",
 "rustversion",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]

 [[package]]
@ -2359,9 +2362,9 @@ dependencies = [

 [[package]]
 name = "syn"
-version = "2.0.76"
+version = "2.0.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "578e081a14e0cefc3279b0472138c513f37b41a08d5a3cca9b6e4e8ceb6cd525"
+checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
 dependencies = [
 "proc-macro2",
 "quote",
@ -2404,9 +2407,9 @@ dependencies = [

 [[package]]
 name = "target-lexicon"
-version = "0.12.15"
+version = "0.12.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4873307b7c257eddcb50c9bedf158eb669578359fb28428bef438fec8e6ba7c2"
+checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"

 [[package]]
 name = "thiserror"
@ -2425,7 +2428,7 @@ checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]

 [[package]]
@ -2504,9 +2507,9 @@ dependencies = [

 [[package]]
 name = "tinyvec"
-version = "1.6.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
 dependencies = [
 "tinyvec_macros",
 ]
@ -2543,14 +2546,14 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]

 [[package]]
 name = "tokio-stream"
-version = "0.1.15"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
+checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1"
 dependencies = [
 "futures-core",
 "pin-project-lite",
@ -2559,9 +2562,9 @@ dependencies = [

 [[package]]
 name = "tokio-util"
-version = "0.7.11"
+version = "0.7.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
+checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a"
 dependencies = [
 "bytes",
 "futures-core",
@ -2636,7 +2639,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]

 [[package]]
@ -2693,9 +2696,9 @@ dependencies = [

 [[package]]
 name = "typeid"
-version = "1.0.0"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "059d83cc991e7a42fc37bd50941885db0888e34209f8cfd9aab07ddec03bc9cf"
+checksum = "0e13db2e0ccd5e14a544e8a246ba2312cd25223f616442d7f2cb0e3db614236e"

 [[package]]
 name = "typenum"
@ -2809,16 +2812,16 @@ dependencies = [

 [[package]]
 name = "validator_derive"
-version = "0.18.1"
+version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55591299b7007f551ed1eb79a684af7672c19c3193fb9e0a31936987bb2438ec"
+checksum = "df0bcf92720c40105ac4b2dda2a4ea3aa717d4d6a862cc217da653a4bd5c6b10"
 dependencies = [
 "darling",
 "once_cell",
 "proc-macro-error",
 "proc-macro2",
 "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]

 [[package]]
@ -2916,7 +2919,7 @@ dependencies = [
 "once_cell",
 "proc-macro2",
 "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 "wasm-bindgen-shared",
 ]

@ -2938,7 +2941,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 "wasm-bindgen-backend",
 "wasm-bindgen-shared",
 ]
@ -2957,9 +2960,9 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"

 [[package]]
 name = "which"
-version = "6.0.1"
+version = "6.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8211e4f58a2b2805adfbefbc07bab82958fc91e3836339b1ab7ae32465dce0d7"
+checksum = "b4ee928febd44d98f2f459a4a79bd4d928591333a494a10a868418ac1b39cf1f"
 dependencies = [
 "either",
 "home",
@ -2985,11 +2988,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"

 [[package]]
 name = "winapi-util"
-version = "0.1.8"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]

 [[package]]
@ -3037,7 +3040,7 @@ checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]

 [[package]]
@ -3048,7 +3051,7 @@ checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]

 [[package]]
@ -3230,7 +3233,7 @@ dependencies = [
 "ansi-to-tui",
 "anyhow",
 "arc-swap",
- "base64 0.22.1",
+ "base64",
 "color_quant",
 "crossterm",
 "futures",
@ -3401,7 +3404,7 @@ version = "0.3.3"
 dependencies = [
 "ansi-to-tui",
 "anyhow",
- "base64 0.22.1",
+ "base64",
 "clipboard-win",
 "crossterm",
 "futures",
@ -3492,6 +3495,7 @@ version = "0.7.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
 dependencies = [
+ "byteorder",
 "zerocopy-derive",
 ]

@ -3503,7 +3507,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.76",
+ "syn 2.0.77",
 ]

 [[package]]
--- a/Cargo.toml
+++ b/Cargo.toml
@ -15,7 +15,7 @@ anyhow        = "1.0.86"
 arc-swap      = "1.7.1"
 base64        = "0.22.1"
 bitflags      = "2.6.0"
-clap          = { version = "4.5.16", features = [ "derive" ] }
+clap          = { version = "4.5.17", features = [ "derive" ] }
 crossterm     = { version = "0.28.1", features = [ "event-stream" ] }
 dirs          = "5.0.1"
 futures       = "0.3.30"
@ -28,11 +28,11 @@ ratatui       = { version = "0.28.1", features = [ "unstable-rendered-line-info"
 regex         = "1.10.6"
 scopeguard    = "1.2.0"
 serde         = { version = "1.0.209", features = [ "derive" ] }
-serde_json    = "1.0.127"
+serde_json    = "1.0.128"
 shell-words   = "1.1.0"
 tokio         = { version = "1.40.0", features = [ "full" ] }
-tokio-stream  = "0.1.15"
-tokio-util    = "0.7.11"
+tokio-stream  = "0.1.16"
+tokio-util    = "0.7.12"
 tracing       = { version = "0.1.40", features = [ "max_level_debug", "release_max_level_warn" ] }
 unicode-width = "0.1.13"
 uzers         = "0.12.1"
--- a/yazi-boot/Cargo.toml
+++ b/yazi-boot/Cargo.toml
@ -20,7 +20,7 @@ serde = { workspace = true }

 [build-dependencies]
 clap                  = { workspace = true }
-clap_complete         = "4.5.24"
+clap_complete         = "4.5.26"
 clap_complete_fig     = "4.5.2"
 clap_complete_nushell = "4.5.3"
 vergen-gitcl          = { version = "1.0.0", features = [ "build" ] }
--- a/yazi-cli/Cargo.toml
+++ b/yazi-cli/Cargo.toml
@ -28,7 +28,7 @@ yazi-shared = { path = "../yazi-shared", version = "0.3.3" }
 # External build dependencies
 anyhow                = { workspace = true }
 clap                  = { workspace = true }
-clap_complete         = "4.5.24"
+clap_complete         = "4.5.26"
 clap_complete_fig     = "4.5.2"
 clap_complete_nushell = "4.5.3"
 serde_json            = { workspace = true }
--- a/yazi-core/Cargo.toml
+++ b/yazi-core/Cargo.toml
@ -25,7 +25,7 @@ bitflags      = { workspace = true }
 crossterm     = { workspace = true }
 dirs          = { workspace = true }
 futures       = { workspace = true }
-notify-fork   = { version = "6.1.1", default-features = false, features = [ "macos_fsevent" ] }
+notify        = { package = "notify-fork", version = "6.1.1", default-features = false, features = [ "macos_fsevent" ] }
 parking_lot   = { workspace = true }
 ratatui       = { workspace = true }
 scopeguard    = { workspace = true }
--- a/yazi-core/src/manager/watcher.rs
+++ b/yazi-core/src/manager/watcher.rs
@ -1,7 +1,7 @@
 use std::{collections::{HashMap, HashSet}, time::Duration};

 use anyhow::Result;
-use notify_fork::{PollWatcher, RecommendedWatcher, RecursiveMode, Watcher as _Watcher};
+use notify::{PollWatcher, RecommendedWatcher, RecursiveMode, Watcher as _Watcher};
 use parking_lot::RwLock;
 use tokio::{fs, pin, sync::{mpsc::{self, UnboundedReceiver}, watch}};
 use tokio_stream::{wrappers::UnboundedReceiverStream, StreamExt};
@ -27,7 +27,7 @@ impl Watcher {
 		let (out_tx, out_rx) = mpsc::unbounded_channel();

 		let out_tx_ = out_tx.clone();
-		let handler = move |res: Result<notify_fork::Event, notify_fork::Error>| {
+		let handler = move |res: Result<notify::Event, notify::Error>| {
 			let Ok(event) = res else { return };
 			if event.kind.is_access() {
 				return;
@ -37,7 +37,7 @@ impl Watcher {
 			}
 		};

-		let config = notify_fork::Config::default().with_poll_interval(Duration::from_millis(500));
+		let config = notify::Config::default().with_poll_interval(Duration::from_millis(500));
 		if *yazi_adapter::WSL {
 			tokio::spawn(Self::fan_in(in_rx, PollWatcher::new(handler, config).unwrap()));
 		} else {
@ -79,7 +79,7 @@ impl Watcher {
 		});
 	}

-	async fn fan_in(mut rx: watch::Receiver<HashSet<Url>>, mut watcher: impl notify_fork::Watcher) {
+	async fn fan_in(mut rx: watch::Receiver<HashSet<Url>>, mut watcher: impl notify::Watcher) {
 		loop {
 			let (mut to_unwatch, mut to_watch): (HashSet<_>, HashSet<_>) = {
 				let (new, old) = (&*rx.borrow_and_update(), &*WATCHED.read());
@ -88,7 +88,7 @@ impl Watcher {

 			to_unwatch.retain(|u| match watcher.unwatch(u) {
 				Ok(_) => true,
-				Err(e) if matches!(e.kind, notify_fork::ErrorKind::WatchNotFound) => true,
+				Err(e) if matches!(e.kind, notify::ErrorKind::WatchNotFound) => true,
 				Err(e) => {
 					error!("Unwatch failed: {e:?}");
 					false
--- a/yazi-plugin/preset/plugins/archive.lua
+++ b/yazi-plugin/preset/plugins/archive.lua
@ -53,6 +53,15 @@ function M:seek(units)
 	end
 end

+function M:spawn_tar(args)
+	local stdout = args[1] and args[1]:sub(0, 2) == "-t" and Command.PIPED or Command.NULL
+	local child, code = Command("tar"):args(args):stdout(stdout):stderr(Command.PIPED):spawn()
+	if not child then
+		return nil, "Failed to spawn, error code: " .. tostring(code)
+	end
+	return child, nil
+end
+
 function M:spawn_7z(args)
 	local last_error = nil
 	local try = function(name)
--- a/yazi-plugin/preset/plugins/extract.lua
+++ b/yazi-plugin/preset/plugins/extract.lua
@ -36,6 +36,38 @@ function M:entry(args)
 	end
 end

+function M:is_tar_compatible(url)
+	local tar_extensions = {
+		".tar.bz2",
+		".tb2",
+		".tbz",
+		".tbz2",
+		".tz2",
+		".tar.gz",
+		".tgz",
+		".taz",
+		".tar.lz",
+		".tlz",
+		".tar.lzma",
+		".tar.lzo",
+		".tar.xz",
+		".txz",
+		".tar.Z",
+		".tZ",
+		".taZ",
+		".tar.zst",
+		".tzst",
+	}
+
+	for _, ext in ipairs(tar_extensions) do
+		if url:find(ext .. "$") then
+			return true
+		end
+	end
+
+	return false
+end
+
 function M:try_with(url, pwd)
 	local parent = url:parent()
 	if not parent then
@ -48,22 +80,44 @@ function M:try_with(url, pwd)
 	end

 	local archive = require("archive")
-	local child, code = archive:spawn_7z { "x", "-aou", "-p" .. pwd, "-o" .. tostring(tmp), tostring(url) }
-	if not child then
-		fail("Spawn `7z` and `7zz` both commands failed, error code %s", code)
-	end
+	if self:is_tar_compatible(tostring(url)) and pwd == "" then
+		fs.create("dir", tmp)
+		local child, code = archive:spawn_tar { "-xaf", tostring(url), "-C", tostring(tmp) }
+		if not child then
+			fail("Failed to spawn `tar` command, error code %s", code)
+		end

-	local output, err = child:wait_with_output()
-	if output and output.status.code == 2 and archive:is_encrypted(output.stderr) then
-		fs.remove("dir_clean", tmp)
-		return true -- Needs retry
-	end
+		local output, err = child:wait_with_output()
+		if output and output.status.code == 2 then
+			fs.remove("dir_clean", tmp)
+			return true -- Needs retry
+		end

-	self:tidy(url, tmp)
-	if not output then
-		fail("7zip failed to output when extracting '%s', error code %s", err, url)
-	elseif output.status.code ~= 0 then
-		fail("7zip exited when extracting '%s', error code %s", url, output.status.code)
+		self:tidy(url, tmp)
+		if not output then
+			fail("tar failed to output when extracting '%s', error code %s", err, url)
+		elseif output.status.code ~= 0 then
+			fail("tar exited when extracting '%s', error code %s", url, output.status.code)
+		end
+	else
+		-- Fall back to 7z for other file types or needs password authentification
+		local child, code = archive:spawn_7z { "x", "-aou", "-p" .. pwd, "-o" .. tostring(tmp), tostring(url) }
+		if not child then
+			fail("Spawn `7z` and `7zz` both commands failed, error code %s", code)
+		end
+
+		local output, err = child:wait_with_output()
+		if output and output.status.code == 2 and archive:is_encrypted(output.stderr) then
+			fs.remove("dir_clean", tmp)
+			return true -- Needs retry
+		end
+
+		self:tidy(url, tmp)
+		if not output then
+			fail("7zip failed to output when extracting '%s', error code %s", err, url)
+		elseif output.status.code ~= 0 then
+			fail("7zip exited when extracting '%s', error code %s", url, output.status.code)
+		end
 	end
 end

--- a/yazi-plugin/src/fs/fs.rs
+++ b/yazi-plugin/src/fs/fs.rs
@ -52,6 +52,21 @@ pub fn install(lua: &Lua) -> mlua::Result<()> {
 					}
 				})?,
 			),
+			(
+				"create",
+				lua.create_async_function(|lua, (type_, url): (mlua::String, UrlRef)| async move {
+					let result = match type_.to_str()? {
+						"file" => fs::File::create(&*url).await.map(|_| ()),
+						"dir" => fs::create_dir(&*url).await,
+						_ => Err("Creation type must be 'file', 'dir'".into_lua_err())?,
+					};
+
+					match result {
+						Ok(_) => (true, Value::Nil).into_lua_multi(lua),
+						Err(e) => (false, e.raw_os_error()).into_lua_multi(lua),
+					}
+				})?,
+			),
 			(
 				"read_dir",
 				lua.create_async_function(|lua, (url, options): (UrlRef, Table)| async move {
Author	SHA1	Message	Date
Dirk Wang	494346845c	Merge `49b6e77d8d` into `9483798459`	2024-09-07 12:13:27 +05:30
sxyazi	9483798459	fix: update `rustix` to fix the `enable_raw_mode()` error on WSL/Android https://github.com/crossterm-rs/crossterm/pull/926#issuecomment-2334770989	2024-09-07 13:52:45 +08:00
DirkFi	49b6e77d8d	Merge remote-tracking branch 'origin/main' into add_tar_lua	2024-09-03 11:16:58 -07:00
DirkFi	9a4bfbba2f	Change stdout to the correct option of tar	2024-09-03 11:14:57 -07:00
DirkFi	0f889f9ed8	Change format based on rustfmt	2024-09-01 15:11:26 -07:00
DirkFi	bfc51d7609	Refactor the PR according to first review * Create a new method "create" in fs.rs * Delete archive:is_encrypted in tar use * Convert the tar command from -xvf to -xaf * Add more File suffix that can be unzipped with tar	2024-09-01 15:05:05 -07:00
DirkFi	69e123ea05	Merge remote-tracking branch 'origin/main' into add_tar_lua	2024-09-01 15:02:57 -07:00
DirkFi	8443f74044	Refactor to make the plugins can use tar to unzip when needed * Add spawn_tar function and tar_compatible function - Create spawn_tar function to run command with tar -xvf to unzip file to tmp file * Add os.excute() line to make sure the tmp dir exists because tar command will not automatically create that dir * Refactor the logic in the try function to if the zip file can be unzipped with tar and no password required, use tar, otherwise use 7z	2024-08-31 17:13:11 -07:00