diff --git a/Cargo.lock b/Cargo.lock index 83a14782..28cefdce 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -91,7 +91,7 @@ dependencies = [ "anstyle", "bstr 1.4.0", "doc-comment", - "predicates 3.0.2", + "predicates", "predicates-core", "predicates-tree", "wait-timeout", @@ -106,7 +106,7 @@ dependencies = [ "anstyle", "doc-comment", "globwalk", - "predicates 3.0.2", + "predicates", "predicates-core", "predicates-tree", "tempfile", @@ -269,9 +269,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "base16ct" -version = "0.1.1" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349a06037c7bf932dd7e7d1f653678b2038b9ad46a74102f1fc7bd7872678cce" +checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf" [[package]] name = "base64" @@ -303,6 +303,12 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "487f1e0fcbe47deb8b0574e646def1c903389d95241dd1bbcc6ce4a715dfc0c1" + [[package]] name = "block-buffer" version = "0.9.0" @@ -466,7 +472,7 @@ checksum = "223163f58c9a40c3b0a43e1c4b50a9ce09f007ea2cb1ec258a687945b4b7929f" dependencies = [ "anstream", "anstyle", - "bitflags", + "bitflags 1.3.2", "clap_lex", "strsim", ] @@ -640,9 +646,9 @@ dependencies = [ [[package]] name = "crypto-bigint" -version = "0.4.9" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef2b4b23cddf68b89b8f8069890e8c270d54e2d5fe1b143820234805e4cb17ef" +checksum = "7c2538c4e68e52548bacb3e83ac549f903d44f011ac9d5abb5e132e67d0808f7" dependencies = [ "generic-array", "rand_core", @@ -723,9 +729,9 @@ checksum = "e412cd91a4ec62fcc739ea50c40babe21e3de60d69f36393cce377c7c04ead5a" [[package]] name = "der" -version = "0.6.1" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1a467a65c5e759bce6e65eaf91cc29f466cdc57cb65777bd646872a8a1fd4de" +checksum = "bc906908ea6458456e5eaa160a9c08543ec3d1e6f71e2235cedd660cb65f9df0" dependencies = [ "const-oid", "pem-rfc7468", @@ -857,16 +863,16 @@ dependencies = [ "directories", "distant-core", "distant-ssh2", - "env_logger 0.10.0", + "env_logger", "flexi_logger", "fork", - "indoc 2.0.1", + "indoc", "log", "once_cell", - "predicates 3.0.2", + "predicates", "rand", "rpassword", - "rstest 0.17.0", + "rstest", "serde", "serde_json", "service-manager", @@ -890,26 +896,26 @@ version = "0.20.0-alpha.4" dependencies = [ "assert_fs", "async-trait", - "bitflags", + "bitflags 2.0.2", "bytes", "clap", "derive_more", "distant-net", - "env_logger 0.9.3", + "env_logger", "futures", "grep", "hex", "ignore", - "indoc 1.0.9", + "indoc", "log", "notify", "num_cpus", "once_cell", - "portable-pty", - "predicates 2.1.5", + "portable-pty 0.8.1", + "predicates", "rand", "regex", - "rstest 0.15.0", + "rstest", "schemars", "serde", "serde_bytes", @@ -933,7 +939,7 @@ dependencies = [ "chacha20poly1305", "derive_more", "dyn-clone", - "env_logger 0.9.3", + "env_logger", "flate2", "hex", "hkdf", @@ -965,16 +971,16 @@ dependencies = [ "derive_more", "distant-core", "dunce", - "env_logger 0.9.3", + "env_logger", "futures", "hex", - "indoc 1.0.9", + "indoc", "log", "once_cell", - "predicates 2.1.5", + "predicates", "rand", "rpassword", - "rstest 0.15.0", + "rstest", "serde", "shell-words", "smol", @@ -993,6 +999,12 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" +[[package]] +name = "downcast-rs" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" + [[package]] name = "dunce" version = "1.0.3" @@ -1007,9 +1019,9 @@ checksum = "68b0cf012f1230e43cd00ebb729c6bb58707ecfa8ad08b52ef3a4ccd2697fc30" [[package]] name = "ecdsa" -version = "0.14.8" +version = "0.16.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413301934810f597c1d19ca71c8710e99a3f1ba28a0d2ebc01551a2daeea3c5c" +checksum = "644d3b8674a5fc5b929ae435bca85c2323d85ccb013a5509c2ac9ee11a6284ba" dependencies = [ "der", "elliptic-curve", @@ -1025,13 +1037,12 @@ checksum = "7fcaabb2fef8c910e7f4c7ce9f67a1283a1715879a7c230ca9d6d1ae31f16d91" [[package]] name = "elliptic-curve" -version = "0.12.3" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7bb888ab5300a19b8e5bceef25ac745ad065f3c9f7efc6de1b91958110891d3" +checksum = "6ea5a92946e8614bb585254898bb7dd1ddad241ace60c52149e3765e34cc039d" dependencies = [ "base16ct", "crypto-bigint", - "der", "digest 0.10.6", "ff", "generic-array", @@ -1069,19 +1080,6 @@ dependencies = [ "encoding_rs", ] -[[package]] -name = "env_logger" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7" -dependencies = [ - "atty", - "humantime", - "log", - "regex", - "termcolor", -] - [[package]] name = "env_logger" version = "0.10.0" @@ -1144,9 +1142,9 @@ dependencies = [ [[package]] name = "ff" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d013fc25338cc558c5c2cfbad646908fb23591e2404481826742b651c9af7160" +checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" dependencies = [ "rand_core", "subtle", @@ -1376,6 +1374,7 @@ checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", "version_check", + "zeroize", ] [[package]] @@ -1414,7 +1413,7 @@ version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93e3af942408868f6934a7b85134a3230832b9977cf66125df2f9edcfce4ddcc" dependencies = [ - "bitflags", + "bitflags 1.3.2", "ignore", "walkdir", ] @@ -1505,9 +1504,9 @@ dependencies = [ [[package]] name = "group" -version = "0.12.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dfbfb3a6cfbd390d5c9564ab283a0349b9b9fcd46a706c1eb10e0db70bfbac7" +checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ "ff", "rand_core", @@ -1631,12 +1630,6 @@ dependencies = [ "hashbrown", ] -[[package]] -name = "indoc" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" - [[package]] name = "indoc" version = "2.0.1" @@ -1649,7 +1642,7 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" dependencies = [ - "bitflags", + "bitflags 1.3.2", "inotify-sys", "libc", ] @@ -1753,7 +1746,7 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8367585489f01bc55dd27404dcf56b95e6da061a256a666ab23be9ba96a2e587" dependencies = [ - "bitflags", + "bitflags 1.3.2", "libc", ] @@ -1781,7 +1774,7 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "411ad6d6b81fd5544f9a9b3b25a9da5533112880fff69b3b659d271a70ec4797" dependencies = [ - "bitflags", + "bitflags 1.3.2", "libssh-rs-sys", "openssl-sys", "thiserror", @@ -1937,10 +1930,24 @@ version = "0.24.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" dependencies = [ - "bitflags", + "bitflags 1.3.2", + "cfg-if", + "libc", + "memoffset 0.6.5", +] + +[[package]] +name = "nix" +version = "0.25.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" +dependencies = [ + "autocfg", + "bitflags 1.3.2", "cfg-if", "libc", "memoffset 0.6.5", + "pin-utils", ] [[package]] @@ -1975,7 +1982,7 @@ version = "5.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "58ea850aa68a06e48fdb069c0ec44d0d64c8dbffa49bf3b6f7f0a901fdea1ba9" dependencies = [ - "bitflags", + "bitflags 1.3.2", "crossbeam-channel", "filetime", "fsevent-sys", @@ -2099,12 +2106,13 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "p256" -version = "0.11.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51f44edd08f51e2ade572f141051021c5af22677e42b7dd28a88155151c33594" +checksum = "7270da3e5caa82afd3deb054cc237905853813aea3859544bc082c3fe55b8d47" dependencies = [ "ecdsa", "elliptic-curve", + "primeorder", "sha2 0.10.6", ] @@ -2187,9 +2195,9 @@ checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd" [[package]] name = "pem-rfc7468" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24d159833a9105500e0398934e205e0773f0b27529557134ecfc51c27646adac" +checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412" dependencies = [ "base64ct", ] @@ -2322,9 +2330,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" [[package]] name = "pkcs8" -version = "0.9.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9eca2c590a5f85da82668fa685c09ce2888b9430e83299debf1f34b65fd4a4ba" +checksum = "3d2820d87d2b008616e5c27212dd9e0e694fb4c6b522de06094106813328cb49" dependencies = [ "der", "spki", @@ -2343,7 +2351,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e1f879b2998099c2d69ab9605d145d5b661195627eccc680002c4918a7fb6fa" dependencies = [ "autocfg", - "bitflags", + "bitflags 1.3.2", "cfg-if", "concurrent-queue", "libc", @@ -2370,7 +2378,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e4d17ec050a6b7ea4b15c430183772bce8384072d3f328e0967e72b7eec46b5" dependencies = [ "anyhow", - "bitflags", + "bitflags 1.3.2", "filedescriptor", "lazy_static", "libc", @@ -2382,24 +2390,31 @@ dependencies = [ ] [[package]] -name = "ppv-lite86" -version = "0.2.17" +name = "portable-pty" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +checksum = "806ee80c2a03dbe1a9fb9534f8d19e4c0546b790cde8fd1fea9d6390644cb0be" +dependencies = [ + "anyhow", + "bitflags 1.3.2", + "downcast-rs", + "filedescriptor", + "lazy_static", + "libc", + "log", + "nix 0.25.1", + "serial", + "shared_library", + "shell-words", + "winapi", + "winreg", +] [[package]] -name = "predicates" -version = "2.1.5" +name = "ppv-lite86" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd" -dependencies = [ - "difflib", - "float-cmp", - "itertools", - "normalize-line-endings", - "predicates-core", - "regex", -] +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "predicates" @@ -2432,6 +2447,15 @@ dependencies = [ "termtree", ] +[[package]] +name = "primeorder" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7613fdcc0831c10060fa69833ea8fa2caa94b6456f51e25356a885b530a2e3d0" +dependencies = [ + "elliptic-curve", +] + [[package]] name = "proc-macro-error" version = "1.0.4" @@ -2532,7 +2556,7 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -2541,7 +2565,7 @@ version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] @@ -2580,13 +2604,12 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" [[package]] name = "rfc6979" -version = "0.3.1" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7743f17af12fa0b03b803ba12cd6a8d9483a587e89c69445e3909655c0b9fabb" +checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2" dependencies = [ - "crypto-bigint", "hmac", - "zeroize", + "subtle", ] [[package]] @@ -2622,18 +2645,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "rstest" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9c9dc66cc29792b663ffb5269be669f1613664e69ad56441fdb895c2347b930" -dependencies = [ - "futures", - "futures-timer", - "rstest_macros 0.14.0", - "rustc_version", -] - [[package]] name = "rstest" version = "0.17.0" @@ -2642,21 +2653,8 @@ checksum = "de1bb486a691878cd320c2f0d319ba91eeaa2e894066d8b5f8f117c000e9d962" dependencies = [ "futures", "futures-timer", - "rstest_macros 0.17.0", - "rustc_version", -] - -[[package]] -name = "rstest_macros" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5015e68a0685a95ade3eee617ff7101ab6a3fc689203101ca16ebc16f2b89c66" -dependencies = [ - "cfg-if", - "proc-macro2", - "quote", + "rstest_macros", "rustc_version", - "syn 1.0.109", ] [[package]] @@ -2698,7 +2696,7 @@ version = "0.36.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db4165c9963ab29e422d6c26fbc1d37f15bace6b2810221f9d925023480fcf0e" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno 0.2.8", "io-lifetimes", "libc", @@ -2712,7 +2710,7 @@ version = "0.37.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e78cc525325c06b4a7ff02db283472f3c042b7ff0c391f96c6d5ac6f4f91b75" dependencies = [ - "bitflags", + "bitflags 1.3.2", "errno 0.3.0", "io-lifetimes", "libc", @@ -2779,9 +2777,9 @@ checksum = "1792db035ce95be60c3f8853017b3999209281c24e2ba5bc8e59bf97a0c590c1" [[package]] name = "sec1" -version = "0.3.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3be24c1842290c45df0a7bf069e0c268a747ad05a192f2fd7dcfdbc1cba40928" +checksum = "48518a2b5775ba8ca5b46596aae011caa431e6ce7e4a67ead66d92f08884220e" dependencies = [ "base16ct", "der", @@ -3000,9 +2998,9 @@ dependencies = [ [[package]] name = "signature" -version = "1.6.4" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" +checksum = "8fe458c98333f9c8152221191a77e2a44e8325d0193484af2e9421a53019e57d" dependencies = [ "digest 0.10.6", "rand_core", @@ -3058,9 +3056,9 @@ dependencies = [ [[package]] name = "spki" -version = "0.6.0" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67cf02bbac7a337dc36e4f5a693db6c21e7863f45070f7064577eb4367a3212b" +checksum = "c0445c905640145c7ea8c1993555957f65e7c46d0535b91ba501bc9bfc85522f" dependencies = [ "base64ct", "der", @@ -3072,7 +3070,7 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7fe461910559f6d5604c3731d00d2aafc4a83d1665922e280f42f9a168d5455" dependencies = [ - "bitflags", + "bitflags 1.3.2", "libc", "libssh2-sys", "parking_lot 0.11.2", @@ -3250,7 +3248,7 @@ checksum = "9509a978a10fcbace4991deae486ae10885e0f4c2c465123e08c9714a90648fa" dependencies = [ "anyhow", "base64 0.21.0", - "bitflags", + "bitflags 1.3.2", "filedescriptor", "finl_unicode", "fixedbitset", @@ -3259,7 +3257,7 @@ dependencies = [ "libc", "log", "memmem", - "nix", + "nix 0.24.3", "num-derive", "num-traits", "ordered-float", @@ -3421,9 +3419,9 @@ dependencies = [ [[package]] name = "typed-path" -version = "0.1.0" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0303bfe6ef379273be7ce99d8a6a2e54261fd110a01cf70986ec0fe855ff075e" +checksum = "4b26db9a2991a51e1e805820c2cabfc974f625ad6457be8a3eaba4c78361484e" [[package]] name = "typenum" @@ -3641,7 +3639,7 @@ checksum = "21b5be360161357d5504d2b773d51fb23c4f9e92507720ef51821444d60cb5bb" dependencies = [ "anyhow", "base64 0.13.1", - "bitflags", + "bitflags 1.3.2", "camino", "dirs-next", "filedescriptor", @@ -3649,7 +3647,7 @@ dependencies = [ "libc", "libssh-rs", "log", - "portable-pty", + "portable-pty 0.7.0", "regex", "smol", "ssh2", @@ -3729,7 +3727,7 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cd9db37ecb5b13762d95468a2fc6009d4b2c62801243223aabd44fca13ad13c8" dependencies = [ - "bitflags", + "bitflags 1.3.2", "widestring", "windows-sys 0.45.0", ] @@ -3881,6 +3879,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "winreg" +version = "0.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "80d0f4e272c85def139476380b12f9ac60926689dd2e01d4923222f40580869d" +dependencies = [ + "winapi", +] + [[package]] name = "winsplit" version = "0.1.0" diff --git a/distant-core/Cargo.toml b/distant-core/Cargo.toml index c3b36e5f..90121aa2 100644 --- a/distant-core/Cargo.toml +++ b/distant-core/Cargo.toml @@ -15,41 +15,41 @@ license = "MIT OR Apache-2.0" schemars = ["dep:schemars", "distant-net/schemars"] [dependencies] -async-trait = "0.1.58" -bitflags = "1.3.2" -bytes = "1.2.1" +async-trait = "0.1.68" +bitflags = "2.0.2" +bytes = "1.4.0" derive_more = { version = "0.99.17", default-features = false, features = ["as_mut", "as_ref", "deref", "deref_mut", "display", "from", "error", "into", "into_iterator", "is_variant", "try_into"] } distant-net = { version = "=0.20.0-alpha.4", path = "../distant-net" } -futures = "0.3.25" -grep = "0.2.10" +futures = "0.3.28" +grep = "0.2.11" hex = "0.4.3" -ignore = "0.4.18" +ignore = "0.4.20" log = "0.4.17" -notify = { version = "5.0.0", features = ["serde"] } -num_cpus = "1.14.0" -once_cell = "1.16.0" -portable-pty = "0.7.0" +notify = { version = "5.1.0", features = ["serde"] } +num_cpus = "1.15.0" +once_cell = "1.17.1" +portable-pty = "0.8.1" rand = { version = "0.8.5", features = ["getrandom"] } -regex = "1.7.0" -serde = { version = "1.0.147", features = ["derive"] } -serde_bytes = "0.11.7" -serde_json = "1.0.88" +regex = "1.7.3" +serde = { version = "1.0.159", features = ["derive"] } +serde_bytes = "0.11.9" +serde_json = "1.0.95" shell-words = "1.1.0" strum = { version = "0.24.1", features = ["derive"] } -tokio = { version = "1.22.0", features = ["full"] } -tokio-util = { version = "0.7.4", features = ["codec"] } -walkdir = "2.3.2" -whoami = "1.2.3" +tokio = { version = "1.27.0", features = ["full"] } +tokio-util = { version = "0.7.7", features = ["codec"] } +walkdir = "2.3.3" +whoami = "1.4.0" winsplit = "0.1.0" # Optional dependencies based on features -clap = { version = "4.0.26", features = ["derive"], optional = true } -schemars = { version = "0.8.11", optional = true } +clap = { version = "4.2.1", features = ["derive"], optional = true } +schemars = { version = "0.8.12", optional = true } [dev-dependencies] -assert_fs = "1.0.9" -env_logger = "0.9.3" -indoc = "1.0.7" -predicates = "2.1.3" -rstest = "0.15.0" +assert_fs = "1.0.12" +env_logger = "0.10.0" +indoc = "2.0.1" +predicates = "3.0.2" +rstest = "0.17.0" test-log = "0.2.11" diff --git a/distant-core/src/api/local/process/pty.rs b/distant-core/src/api/local/process/pty.rs index 73bf942e..dc08ec55 100644 --- a/distant-core/src/api/local/process/pty.rs +++ b/distant-core/src/api/local/process/pty.rs @@ -77,7 +77,7 @@ impl PtyProcess { // Spawn a blocking task to process submitting stdin async let (stdin_tx, mut stdin_rx) = mpsc::channel::>(1); let mut stdin_writer = pty_master - .try_clone_writer() + .take_writer() .map_err(|x| io::Error::new(io::ErrorKind::Other, x))?; let stdin_task = tokio::task::spawn_blocking(move || { while let Some(input) = stdin_rx.blocking_recv() { diff --git a/distant-core/src/data/metadata.rs b/distant-core/src/data/metadata.rs index 6a25a9e3..9a42ec23 100644 --- a/distant-core/src/data/metadata.rs +++ b/distant-core/src/data/metadata.rs @@ -217,7 +217,7 @@ impl From for u32 { flags.insert(UnixFilePermissionFlags::OTHER_EXEC); } - flags.bits + flags.bits() } } @@ -378,7 +378,7 @@ impl From for u32 { flags.insert(WindowsFileAttributeFlags::TEMPORARY); } - flags.bits + flags.bits() } } diff --git a/distant-net/Cargo.toml b/distant-net/Cargo.toml index a8e57be4..a18d8291 100644 --- a/distant-net/Cargo.toml +++ b/distant-net/Cargo.toml @@ -12,30 +12,30 @@ readme = "README.md" license = "MIT OR Apache-2.0" [dependencies] -async-trait = "0.1.58" -bytes = "1.2.1" +async-trait = "0.1.68" +bytes = "1.4.0" chacha20poly1305 = "0.10.1" derive_more = { version = "0.99.17", default-features = false, features = ["as_mut", "as_ref", "deref", "deref_mut", "display", "from", "error", "into", "into_iterator", "is_variant", "try_into"] } -dyn-clone = "1.0.9" -flate2 = "1.0.24" +dyn-clone = "1.0.11" +flate2 = "1.0.25" hex = "0.4.3" hkdf = "0.12.3" log = "0.4.17" -paste = "1.0.9" -p256 = { version = "0.11.1", features = ["ecdh", "pem"] } +paste = "1.0.12" +p256 = { version = "0.13.0", features = ["ecdh", "pem"] } rand = { version = "0.8.5", features = ["getrandom"] } rmp-serde = "1.1.1" sha2 = "0.10.6" -serde = { version = "1.0.147", features = ["derive"] } -serde_bytes = "0.11.7" +serde = { version = "1.0.159", features = ["derive"] } +serde_bytes = "0.11.9" strum = { version = "0.24.1", features = ["derive"] } -tokio = { version = "1.22.0", features = ["full"] } +tokio = { version = "1.27.0", features = ["full"] } # Optional dependencies based on features -schemars = { version = "0.8.11", optional = true } +schemars = { version = "0.8.12", optional = true } [dev-dependencies] -env_logger = "0.9.3" -serde_json = "1.0.94" -tempfile = "3.3.0" +env_logger = "0.10.0" +serde_json = "1.0.95" +tempfile = "3.5.0" test-log = "0.2.11" diff --git a/distant-ssh2/Cargo.toml b/distant-ssh2/Cargo.toml index 0d0ac34c..9b56c70e 100644 --- a/distant-ssh2/Cargo.toml +++ b/distant-ssh2/Cargo.toml @@ -17,34 +17,34 @@ ssh2 = ["wezterm-ssh/ssh2", "wezterm-ssh/vendored-openssl-ssh2"] [dependencies] async-compat = "0.2.1" -async-once-cell = "0.4.2" -async-trait = "0.1.58" +async-once-cell = "0.4.4" +async-trait = "0.1.68" derive_more = { version = "0.99.17", default-features = false, features = ["display", "error"] } distant-core = { version = "=0.20.0-alpha.4", path = "../distant-core" } -futures = "0.3.25" +futures = "0.3.28" hex = "0.4.3" log = "0.4.17" rand = { version = "0.8.5", features = ["getrandom"] } -rpassword = "7.1.0" +rpassword = "7.2.0" shell-words = "1.1.0" -smol = "1.2.5" -tokio = { version = "1.22.0", features = ["full"] } -typed-path = "0.1.0" +smol = "1.3.0" +tokio = { version = "1.27.0", features = ["full"] } +typed-path = "0.3.2" wezterm-ssh = { version = "0.4.0", default-features = false } winsplit = "0.1.0" # Optional serde support for data structures -serde = { version = "1.0.147", features = ["derive"], optional = true } +serde = { version = "1.0.159", features = ["derive"], optional = true } [dev-dependencies] -anyhow = "1.0.66" -assert_fs = "1.0.9" +anyhow = "1.0.70" +assert_fs = "1.0.12" dunce = "1.0.3" -env_logger = "0.9.3" -indoc = "1.0.7" -once_cell = "1.16.0" -predicates = "2.1.3" -rstest = "0.15.0" +env_logger = "0.10.0" +indoc = "2.0.1" +once_cell = "1.17.1" +predicates = "3.0.2" +rstest = "0.17.0" test-log = "0.2.11" -which = "4.3.0" -whoami = "1.2.3" +which = "4.4.0" +whoami = "1.4.0" diff --git a/src/cli/commands/client/format.rs b/src/cli/commands/client/format.rs index 7680f881..81751ee3 100644 --- a/src/cli/commands/client/format.rs +++ b/src/cli/commands/client/format.rs @@ -415,7 +415,7 @@ fn format_shell(state: &mut FormatterState, data: DistantResponseData) -> Output .to_string() .into_bytes(); - Output::Stdout(table) + Output::StdoutLine(table) } } } diff --git a/tests/cli/action/search.rs b/tests/cli/action/search.rs index 0b9c9a46..cda5af5c 100644 --- a/tests/cli/action/search.rs +++ b/tests/cli/action/search.rs @@ -37,7 +37,7 @@ fn should_search_filesystem_using_query(mut action_cmd: CtxCommand) { lines.sort_unstable(); // Put together sorted text lines - let full_text = lines.join("\n\n"); + let full_text = format!("{}\n", lines.join("\n\n")); // Verify that it matches our search results regex let regex_fn = predicates::str::is_match(SEARCH_RESULTS_REGEX).unwrap(); @@ -45,7 +45,7 @@ fn should_search_filesystem_using_query(mut action_cmd: CtxCommand) { regex_fn.eval(&full_text) }); - // distant action system-info + // distant action search action_cmd .arg("search") .arg("te[a-z]*\\b") diff --git a/tests/cli/manager/capabilities.rs b/tests/cli/manager/capabilities.rs index c42ad2de..bb2b8629 100644 --- a/tests/cli/manager/capabilities.rs +++ b/tests/cli/manager/capabilities.rs @@ -35,6 +35,6 @@ fn should_output_capabilities(ctx: DistantManagerCtx) { ctx.new_assert_cmd(vec!["manager", "capabilities"]) .assert() .success() - .stdout(format!("{EXPECTED_TABLE}\n")) + .stdout(EXPECTED_TABLE) .stderr(""); }