From 90305607e90277cfeae7970f472d352fb1f20d84 Mon Sep 17 00:00:00 2001 From: Chip Senkbeil Date: Fri, 31 Mar 2023 19:31:28 -0500 Subject: [PATCH] Bump dependency versions and update to v0.20.0-alpha.4 --- Cargo.lock | 221 +++++++++++++++++++--------------------- Cargo.toml | 60 +++++------ distant-core/Cargo.toml | 4 +- distant-net/Cargo.toml | 2 +- distant-ssh2/Cargo.toml | 4 +- 5 files changed, 141 insertions(+), 150 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index cc72d72..83a1478 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -508,16 +508,6 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "combine" -version = "4.6.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" -dependencies = [ - "bytes", - "memchr", -] - [[package]] name = "concolor-override" version = "1.0.0" @@ -792,11 +782,11 @@ dependencies = [ [[package]] name = "directories" -version = "4.0.1" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51c5d4ddabd36886dd3e1438cb358cdcb0d7c499cb99cb4ac2e38e18b5cb210" +checksum = "74be3be809c18e089de43bdc504652bb2bc473fca8756131f8689db8cf079ba9" dependencies = [ - "dirs-sys", + "dirs-sys 0.4.0", ] [[package]] @@ -805,7 +795,7 @@ version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ca3aa72a6f96ea37bbc5aa912f6788242832f75369bdfdadcb0e38423f100059" dependencies = [ - "dirs-sys", + "dirs-sys 0.3.7", ] [[package]] @@ -829,6 +819,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "dirs-sys" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04414300db88f70d74c5ff54e50f9e1d1737d9a5b90f53fcf2e95ca2a9ab554b" +dependencies = [ + "libc", + "redox_users", + "windows-sys 0.45.0", +] + [[package]] name = "dirs-sys-next" version = "0.1.2" @@ -842,7 +843,7 @@ dependencies = [ [[package]] name = "distant" -version = "0.20.0-alpha.3" +version = "0.20.0-alpha.4" dependencies = [ "anyhow", "assert_cmd", @@ -856,16 +857,16 @@ dependencies = [ "directories", "distant-core", "distant-ssh2", - "env_logger", + "env_logger 0.10.0", "flexi_logger", "fork", - "indoc", + "indoc 2.0.1", "log", "once_cell", - "predicates 2.1.5", + "predicates 3.0.2", "rand", "rpassword", - "rstest", + "rstest 0.17.0", "serde", "serde_json", "service-manager", @@ -885,7 +886,7 @@ dependencies = [ [[package]] name = "distant-core" -version = "0.20.0-alpha.3" +version = "0.20.0-alpha.4" dependencies = [ "assert_fs", "async-trait", @@ -894,12 +895,12 @@ dependencies = [ "clap", "derive_more", "distant-net", - "env_logger", + "env_logger 0.9.3", "futures", "grep", "hex", "ignore", - "indoc", + "indoc 1.0.9", "log", "notify", "num_cpus", @@ -908,7 +909,7 @@ dependencies = [ "predicates 2.1.5", "rand", "regex", - "rstest", + "rstest 0.15.0", "schemars", "serde", "serde_bytes", @@ -925,14 +926,14 @@ dependencies = [ [[package]] name = "distant-net" -version = "0.20.0-alpha.3" +version = "0.20.0-alpha.4" dependencies = [ "async-trait", "bytes", "chacha20poly1305", "derive_more", "dyn-clone", - "env_logger", + "env_logger 0.9.3", "flate2", "hex", "hkdf", @@ -954,7 +955,7 @@ dependencies = [ [[package]] name = "distant-ssh2" -version = "0.20.0-alpha.3" +version = "0.20.0-alpha.4" dependencies = [ "anyhow", "assert_fs", @@ -964,16 +965,16 @@ dependencies = [ "derive_more", "distant-core", "dunce", - "env_logger", + "env_logger 0.9.3", "futures", "hex", - "indoc", + "indoc 1.0.9", "log", "once_cell", "predicates 2.1.5", "rand", "rpassword", - "rstest", + "rstest 0.15.0", "serde", "shell-words", "smol", @@ -1082,17 +1083,16 @@ dependencies = [ ] [[package]] -name = "err-derive" -version = "0.3.1" +name = "env_logger" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c34a887c8df3ed90498c1c437ce21f211c8e27672921a8ffa293cb8d6d4caa9e" +checksum = "85cdab6a89accf66733ad5a1693a4dcced6aeff64602b634530dd73c1f3ee9f0" dependencies = [ - "proc-macro-error", - "proc-macro2", - "quote", - "rustversion", - "syn 1.0.109", - "synstructure", + "humantime", + "is-terminal", + "log", + "regex", + "termcolor", ] [[package]] @@ -1211,13 +1211,13 @@ dependencies = [ [[package]] name = "flexi_logger" -version = "0.24.2" +version = "0.25.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ade8e86c48285f138a4d6ca15a2912e39bd6c74d62db42da4f1985f651a0b057" +checksum = "6eae57842a8221ef13f1f207632d786a175dd13bd8fbdc8be9d852f7c9cf1046" dependencies = [ - "atty", "chrono", "glob", + "is-terminal", "lazy_static", "log", "nu-ansi-term", @@ -1637,6 +1637,12 @@ version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa799dd5ed20a7e349f3b4639aa80d74549c81716d9ec4f994c9b5815598306" +[[package]] +name = "indoc" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f2cb48b81b1dc9f39676bf99f5499babfec7cd8fe14307f7b3d747208fb5690" + [[package]] name = "inotify" version = "0.9.6" @@ -2403,8 +2409,11 @@ checksum = "c575290b64d24745b6c57a12a31465f0a66f3a4799686a6921526a33b0797965" dependencies = [ "anstyle", "difflib", + "float-cmp", "itertools", + "normalize-line-endings", "predicates-core", + "regex", ] [[package]] @@ -2621,7 +2630,19 @@ checksum = "e9c9dc66cc29792b663ffb5269be669f1613664e69ad56441fdb895c2347b930" dependencies = [ "futures", "futures-timer", - "rstest_macros", + "rstest_macros 0.14.0", + "rustc_version", +] + +[[package]] +name = "rstest" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de1bb486a691878cd320c2f0d319ba91eeaa2e894066d8b5f8f117c000e9d962" +dependencies = [ + "futures", + "futures-timer", + "rstest_macros 0.17.0", "rustc_version", ] @@ -2638,6 +2659,20 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "rstest_macros" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "290ca1a1c8ca7edb7c3283bd44dc35dd54fdec6253a3912e201ba1072018fca8" +dependencies = [ + "cfg-if", + "proc-macro2", + "quote", + "rustc_version", + "syn 1.0.109", + "unicode-ident", +] + [[package]] name = "rtoolbox" version = "0.0.1" @@ -2831,6 +2866,15 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_spanned" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" +dependencies = [ + "serde", +] + [[package]] name = "serial" version = "0.4.0" @@ -3090,23 +3134,11 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "synstructure" -version = "0.12.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", - "unicode-xid", -] - [[package]] name = "sysinfo" -version = "0.26.9" +version = "0.28.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c18a6156d1f27a9592ee18c1a846ca8dd5c258b7179fc193ae87c74ebb666f5" +checksum = "b4c2f3ca6693feb29a89724516f016488e9aafc7f37264f898593ee4b942f31b" dependencies = [ "cfg-if", "core-foundation-sys", @@ -3347,24 +3379,24 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "0.5.1" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4553f467ac8e3d374bc9a177a26801e5d0f9b211aa1673fb137a403afd1c9cf5" +checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" dependencies = [ "serde", ] [[package]] name = "toml_edit" -version = "0.15.0" +version = "0.19.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1541ba70885967e662f69d31ab3aeca7b1aaecfcd58679590b893e9239c3646" +checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13" dependencies = [ - "combine", "indexmap", - "itertools", "serde", + "serde_spanned", "toml_datetime", + "winnow", ] [[package]] @@ -3423,12 +3455,6 @@ version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" -[[package]] -name = "unicode-xid" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" - [[package]] name = "universal-hash" version = "0.5.0" @@ -3699,27 +3725,13 @@ dependencies = [ [[package]] name = "windows-service" -version = "0.5.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "917fdb865e7ff03af9dd86609f8767bc88fefba89e8efd569de8e208af8724b3" +checksum = "cd9db37ecb5b13762d95468a2fc6009d4b2c62801243223aabd44fca13ad13c8" dependencies = [ "bitflags", - "err-derive", "widestring", - "windows-sys 0.36.1", -] - -[[package]] -name = "windows-sys" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2" -dependencies = [ - "windows_aarch64_msvc 0.36.1", - "windows_i686_gnu 0.36.1", - "windows_i686_msvc 0.36.1", - "windows_x86_64_gnu 0.36.1", - "windows_x86_64_msvc 0.36.1", + "windows-sys 0.45.0", ] [[package]] @@ -3788,12 +3800,6 @@ version = "0.47.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "831d567d53d4f3cb1db332b68e6e2b6260228eb4d99a777d8b2e8ed794027c90" -[[package]] -name = "windows_aarch64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47" - [[package]] name = "windows_aarch64_msvc" version = "0.42.2" @@ -3806,12 +3812,6 @@ version = "0.47.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a42d54a417c60ce4f0e31661eed628f0fa5aca73448c093ec4d45fab4c51cdf" -[[package]] -name = "windows_i686_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6" - [[package]] name = "windows_i686_gnu" version = "0.42.2" @@ -3824,12 +3824,6 @@ version = "0.47.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1925beafdbb22201a53a483db861a5644123157c1c3cee83323a2ed565d71e3" -[[package]] -name = "windows_i686_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024" - [[package]] name = "windows_i686_msvc" version = "0.42.2" @@ -3842,12 +3836,6 @@ version = "0.47.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3a8ef8f2f1711b223947d9b69b596cf5a4e452c930fb58b6fc3fdae7d0ec6b31" -[[package]] -name = "windows_x86_64_gnu" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1" - [[package]] name = "windows_x86_64_gnu" version = "0.42.2" @@ -3872,12 +3860,6 @@ version = "0.47.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5a0628f71be1d11e17ca4a0e9e15b3a5180f6fbf1c2d55e3ba3f850378052c1" -[[package]] -name = "windows_x86_64_msvc" -version = "0.36.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680" - [[package]] name = "windows_x86_64_msvc" version = "0.42.2" @@ -3890,6 +3872,15 @@ version = "0.47.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d6e62c256dc6d40b8c8707df17df8d774e60e39db723675241e7c15e910bce7" +[[package]] +name = "winnow" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae8970b36c66498d8ff1d66685dc86b91b29db0c7739899012f63a63814b4b28" +dependencies = [ + "memchr", +] + [[package]] name = "winsplit" version = "0.1.0" diff --git a/Cargo.toml b/Cargo.toml index 2497aa3..3a8608f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ name = "distant" description = "Operate on a remote computer through file and process manipulation" categories = ["command-line-utilities"] keywords = ["cli"] -version = "0.20.0-alpha.3" +version = "0.20.0-alpha.4" authors = ["Chip Senkbeil "] edition = "2021" homepage = "https://github.com/chipsenkbeil/distant" @@ -25,49 +25,49 @@ libssh = ["distant-ssh2/libssh"] ssh2 = ["distant-ssh2/ssh2"] [dependencies] -anyhow = "1.0.66" -async-trait = "0.1.58" -clap = { version = "4.0.26", features = ["derive"] } -clap_complete = "4.0.5" -config = { version = "0.13.2", default-features = false, features = ["toml"] } +anyhow = "1.0.70" +async-trait = "0.1.68" +clap = { version = "4.2.1", features = ["derive"] } +clap_complete = "4.2.0" +config = { version = "0.13.3", default-features = false, features = ["toml"] } derive_more = { version = "0.99.17", default-features = false, features = ["display", "from", "error", "is_variant"] } -dialoguer = { version = "0.10.2", default-features = false } -distant-core = { version = "=0.20.0-alpha.3", path = "distant-core", features = ["clap", "schemars"] } -directories = "4.0.1" -flexi_logger = "0.24.1" -indoc = "1.0.7" +dialoguer = { version = "0.10.3", default-features = false } +distant-core = { version = "=0.20.0-alpha.4", path = "distant-core", features = ["clap", "schemars"] } +directories = "5.0.0" +flexi_logger = "0.25.3" +indoc = "2.0.1" log = "0.4.17" -once_cell = "1.16.0" +once_cell = "1.17.1" rand = { version = "0.8.5", features = ["getrandom"] } -rpassword = "7.1.0" -serde = { version = "1.0.147", features = ["derive"] } -serde_json = "1.0.88" +rpassword = "7.2.0" +serde = { version = "1.0.159", features = ["derive"] } +serde_json = "1.0.95" shell-words = "1.1.0" service-manager = { version = "0.2.0", features = ["clap", "serde"] } tabled = "0.10.0" -tokio = { version = "1.22.0", features = ["full"] } -toml_edit = { version = "0.15.0", features = ["serde"] } -terminal_size = "0.2.2" +tokio = { version = "1.27.0", features = ["full"] } +toml_edit = { version = "0.19.8", features = ["serde"] } +terminal_size = "0.2.5" termwiz = "0.20.0" -which = "4.3.0" +which = "4.4.0" winsplit = "0.1.0" -whoami = "1.2.3" +whoami = "1.4.0" # Optional native SSH functionality -distant-ssh2 = { version = "=0.20.0-alpha.3", path = "distant-ssh2", default-features = false, features = ["serde"], optional = true } +distant-ssh2 = { version = "=0.20.0-alpha.4", path = "distant-ssh2", default-features = false, features = ["serde"], optional = true } [target.'cfg(unix)'.dependencies] -fork = "0.1.20" +fork = "0.1.21" [target.'cfg(windows)'.dependencies] -sysinfo = "0.26.7" -windows-service = "0.5.0" +sysinfo = "0.28.4" +windows-service = "0.6.0" [dev-dependencies] -assert_cmd = "2.0.6" -assert_fs = "1.0.9" -env_logger = "0.9.3" -indoc = "1.0.7" -predicates = "2.1.3" -rstest = "0.15.0" +assert_cmd = "2.0.10" +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/Cargo.toml b/distant-core/Cargo.toml index fa53c0b..c3b36e5 100644 --- a/distant-core/Cargo.toml +++ b/distant-core/Cargo.toml @@ -3,7 +3,7 @@ name = "distant-core" description = "Core library for distant, enabling operation on a remote computer through file and process manipulation" categories = ["network-programming"] keywords = ["api", "async"] -version = "0.20.0-alpha.3" +version = "0.20.0-alpha.4" authors = ["Chip Senkbeil "] edition = "2021" homepage = "https://github.com/chipsenkbeil/distant" @@ -19,7 +19,7 @@ async-trait = "0.1.58" bitflags = "1.3.2" bytes = "1.2.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"] } -distant-net = { version = "=0.20.0-alpha.3", path = "../distant-net" } +distant-net = { version = "=0.20.0-alpha.4", path = "../distant-net" } futures = "0.3.25" grep = "0.2.10" hex = "0.4.3" diff --git a/distant-net/Cargo.toml b/distant-net/Cargo.toml index 67517ce..a8e57be 100644 --- a/distant-net/Cargo.toml +++ b/distant-net/Cargo.toml @@ -3,7 +3,7 @@ name = "distant-net" description = "Network library for distant, providing implementations to support client/server architecture" categories = ["network-programming"] keywords = ["api", "async"] -version = "0.20.0-alpha.3" +version = "0.20.0-alpha.4" authors = ["Chip Senkbeil "] edition = "2021" homepage = "https://github.com/chipsenkbeil/distant" diff --git a/distant-ssh2/Cargo.toml b/distant-ssh2/Cargo.toml index 7958f02..0d0ac34 100644 --- a/distant-ssh2/Cargo.toml +++ b/distant-ssh2/Cargo.toml @@ -2,7 +2,7 @@ name = "distant-ssh2" description = "Library to enable native ssh-2 protocol for use with distant sessions" categories = ["network-programming"] -version = "0.20.0-alpha.3" +version = "0.20.0-alpha.4" authors = ["Chip Senkbeil "] edition = "2021" homepage = "https://github.com/chipsenkbeil/distant" @@ -20,7 +20,7 @@ async-compat = "0.2.1" async-once-cell = "0.4.2" async-trait = "0.1.58" derive_more = { version = "0.99.17", default-features = false, features = ["display", "error"] } -distant-core = { version = "=0.20.0-alpha.3", path = "../distant-core" } +distant-core = { version = "=0.20.0-alpha.4", path = "../distant-core" } futures = "0.3.25" hex = "0.4.3" log = "0.4.17"