Archives
/
distant
mirror of https://github.com/chipsenkbeil/distant
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bump dependencies and correct breakages

Browse Source
pull/191/head
Chip Senkbeil 1 year ago
parent ec01a60984
commit be9b952164
No known key found for this signature in database
GPG Key ID: 35EF1F8EC72A4131
10 changed files with 102 additions and 110 deletions
Show Stats Download Patch File Download Diff File

94
Cargo.lock generated
Unescape Escape View File

@ -223,9 +223,9 @@ dependencies = [
[[package]]
name = "async-once-cell"
version = "0.4.4"
version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b49bd4c5b769125ea6323601c39815848972880efd33ffb2d01f9f909adc699"
checksum = "fddec5f567375e0a634f94bc8dab1059b9d59a8aba12134c32f5ee21ce3f5f89"
[[package]]
name = "async-process"
@ -474,9 +474,9 @@ dependencies = [
[[package]]
name = "clap"
version = "4.2.7"
version = "4.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "34d21f9bf1b425d2968943631ec91202fe5e837264063503708b83013f8fc938"
checksum = "93aae7a4192245f70fe75dd9157fc7b4a5bf53e88d30bd4396f7d8f9284d5acc"
dependencies = [
"clap_builder",
"clap_derive",
@ -485,9 +485,9 @@ dependencies = [
[[package]]
name = "clap_builder"
version = "4.2.7"
version = "4.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "914c8c79fb560f238ef6429439a30023c862f7a28e688c58f7203f12b29970bd"
checksum = "4f423e341edefb78c9caba2d9c7f7687d0e72e89df3ce3394554754393ac3990"
dependencies = [
"anstream",
"anstyle",
@ -498,18 +498,18 @@ dependencies = [
[[package]]
name = "clap_complete"
version = "4.2.3"
version = "4.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1594fe2312ec4abf402076e407628f5c313e54c32ade058521df4ee34ecac8a8"
checksum = "a04ddfaacc3bc9e6ea67d024575fafc2a813027cf374b8f24f7bc233c6b6be12"
dependencies = [
"clap",
]
[[package]]
name = "clap_derive"
version = "4.2.0"
version = "4.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f9644cd56d6b87dbe899ef8b053e331c0637664e9e21a33dfcdc36093f5c5c4"
checksum = "191d9573962933b4027f932c600cd252ce27a8ad5979418fe78e43c07996f27b"
dependencies = [
"heck",
"proc-macro2",
@ -519,9 +519,9 @@ dependencies = [
[[package]]
name = "clap_lex"
version = "0.4.1"
version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a2dd5a6fe8c6e3502f568a6353e5273bbb15193ad9a89e457b9970798efbea1"
checksum = "2da6da31387c7e4ef160ffab6d5e7f00c42626fe39aea70a7b0f1773f7dd6c1b"
[[package]]
name = "colorchoice"
@ -1210,9 +1210,9 @@ dependencies = [
[[package]]
name = "flexi_logger"
version = "0.25.4"
version = "0.25.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "611de758a8869ffffa7524aafdb48658c64dae95cdce49654d68a8442e500d89"
checksum = "37e7b68b1f7ce9c62856598e99cd6742b9cedb6186b47aa989a82640f20bfa9b"
dependencies = [
"chrono",
"glob",
@ -1836,12 +1836,9 @@ dependencies = [
[[package]]
name = "log"
version = "0.4.17"
version = "0.4.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
dependencies = [
"cfg-if",
]
checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de"
[[package]]
name = "memchr"
@ -1991,12 +1988,11 @@ dependencies = [
[[package]]
name = "nu-ansi-term"
version = "0.46.0"
version = "0.47.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
checksum = "1df031e117bca634c262e9bd3173776844b6c17a90b3741c9163663b4385af76"
dependencies = [
"overload",
"winapi",
"windows-sys 0.45.0",
]
[[package]]
@ -2041,9 +2037,9 @@ dependencies = [
[[package]]
name = "once_cell"
version = "1.17.1"
version = "1.17.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3"
checksum = "9670a07f94779e00908f3e686eab508878ebb390ba6e604d3a284c00e8d0487b"
[[package]]
name = "opaque-debug"
@ -2089,12 +2085,6 @@ dependencies = [
"num-traits",
]
[[package]]
name = "overload"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
[[package]]
name = "p256"
version = "0.13.2"
@ -2109,9 +2099,9 @@ dependencies = [
[[package]]
name = "papergrid"
version = "0.7.1"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1526bb6aa9f10ec339fb10360f22c57edf81d5678d0278e93bc12a47ffbe4b01"
checksum = "1fdfe703c51ddc52887ad78fc69cd2ea78d895ffcd6e955c9d03566db8ab5bb1"
dependencies = [
"bytecount",
"fnv",
@ -2572,13 +2562,13 @@ dependencies = [
[[package]]
name = "regex"
version = "1.8.1"
version = "1.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "af83e617f331cc6ae2da5443c602dfa5af81e517212d9d611a5b3ba1777b5370"
checksum = "81ca098a9821bd52d6b24fd8b10bd081f47d39c22778cafaa75a2857a62c6390"
dependencies = [
"aho-corasick 1.0.1",
"memchr",
"regex-syntax 0.7.1",
"regex-syntax 0.7.2",
]
[[package]]
@ -2595,9 +2585,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
[[package]]
name = "regex-syntax"
version = "0.7.1"
version = "0.7.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a5996294f19bd3aae0453a862ad728f60e6600695733dd5df01da90c54363a3c"
checksum = "436b050e76ed2903236f032a59761c1eb99e1b0aead2c257922771dab1fc8c78"
[[package]]
name = "rfc6979"
@ -2808,9 +2798,9 @@ dependencies = [
[[package]]
name = "serde_spanned"
version = "0.6.1"
version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4"
checksum = "93107647184f6027e3b7dcb2e11034cf95ffa1e3a682c67951963ac69c1c007d"
dependencies = [
"serde",
]
@ -3076,9 +3066,9 @@ dependencies = [
[[package]]
name = "sysinfo"
version = "0.28.4"
version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b4c2f3ca6693feb29a89724516f016488e9aafc7f37264f898593ee4b942f31b"
checksum = "02f1dc6930a439cc5d154221b5387d153f8183529b07c19aca24ea31e0a167e1"
dependencies = [
"cfg-if",
"core-foundation-sys",
@ -3091,9 +3081,9 @@ dependencies = [
[[package]]
name = "tabled"
version = "0.10.0"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "56c3ee73732ffceaea7b8f6b719ce3bb17f253fa27461ffeaf568ebd0cdb4b85"
checksum = "da1a2e56bbf7bfdd08aaa7592157a742205459eff774b73bc01809ae2d99dc2a"
dependencies = [
"papergrid",
"tabled_derive",
@ -3102,9 +3092,9 @@ dependencies = [
[[package]]
name = "tabled_derive"
version = "0.5.0"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "beca1b4eaceb4f2755df858b88d9b9315b7ccfd1ffd0d7a48a52602301f01a57"
checksum = "99f688a08b54f4f02f0a3c382aefdb7884d3d69609f785bd253dc033243e3fe4"
dependencies = [
"heck",
"proc-macro-error",
@ -3266,9 +3256,9 @@ dependencies = [
[[package]]
name = "tokio"
version = "1.28.1"
version = "1.28.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0aa32867d44e6f2ce3385e89dceb990188b8bb0fb25b0cf576647a6f98ac5105"
checksum = "94d7b1cfd2aa4011f2de74c2c4c63665e27a71006b0a192dcd2710272e73dfa2"
dependencies = [
"autocfg",
"bytes",
@ -3305,18 +3295,18 @@ dependencies = [
[[package]]
name = "toml_datetime"
version = "0.6.1"
version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622"
checksum = "5a76a9312f5ba4c2dec6b9161fdf25d87ad8a09256ccea5a556fef03c706a10f"
dependencies = [
"serde",
]
[[package]]
name = "toml_edit"
version = "0.19.8"
version = "0.19.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "239410c8609e8125456927e6707163a3b1fdb40561e4b803bc041f466ccfdc13"
checksum = "2380d56e8670370eee6566b0bfd4265f65b3f432e8c6d85623f728d4fa31f739"
dependencies = [
"indexmap",
"serde",

36
Cargo.toml
Unescape Escape View File

@ -32,31 +32,31 @@ libssh = ["distant-ssh2/libssh"]
ssh2 = ["distant-ssh2/ssh2"]
[dependencies]
anyhow = "1.0.70"
anyhow = "1.0.71"
async-trait = "0.1.68"
clap = { version = "4.2.1", features = ["derive"] }
clap_complete = "4.2.0"
clap = { version = "4.3.0", features = ["derive"] }
clap_complete = "4.3.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.3", default-features = false }
dialoguer = { version = "0.10.4", default-features = false }
distant-core = { version = "=0.20.0-alpha.7", path = "distant-core" }
distant-local = { version = "=0.20.0-alpha.7", path = "distant-local" }
directories = "5.0.0"
directories = "5.0.1"
file-mode = "0.1.2"
flexi_logger = "0.25.3"
flexi_logger = "0.25.5"
indoc = "2.0.1"
log = "0.4.17"
once_cell = "1.17.1"
log = "0.4.18"
once_cell = "1.17.2"
rand = { version = "0.8.5", features = ["getrandom"] }
rpassword = "7.2.0"
serde = { version = "1.0.159", features = ["derive"] }
serde_json = "1.0.95"
serde = { version = "1.0.163", features = ["derive"] }
serde_json = "1.0.96"
shell-words = "1.1.0"
service-manager = { version = "0.2.0", features = ["clap", "serde"] }
tabled = "0.10.0"
tokio = { version = "1.27.0", features = ["full"] }
toml_edit = { version = "0.19.8", features = ["serde"] }
terminal_size = "0.2.5"
tabled = "0.12.0"
tokio = { version = "1.28.2", features = ["full"] }
toml_edit = { version = "0.19.10", features = ["serde"] }
terminal_size = "0.2.6"
termwiz = "0.20.0"
which = "4.4.0"
winsplit = "0.1.0"
@ -69,14 +69,14 @@ distant-ssh2 = { version = "=0.20.0-alpha.7", path = "distant-ssh2", default-fea
fork = "0.1.21"
[target.'cfg(windows)'.dependencies]
sysinfo = "0.28.4"
sysinfo = "0.29.0"
windows-service = "0.6.0"
[dev-dependencies]
assert_cmd = "2.0.10"
assert_fs = "1.0.12"
assert_cmd = "2.0.11"
assert_fs = "1.0.13"
env_logger = "0.10.0"
indoc = "2.0.1"
predicates = "3.0.2"
predicates = "3.0.3"
rstest = "0.17.0"
test-log = "0.2.11"

6
distant-auth/Cargo.toml
Unescape Escape View File

@ -18,10 +18,10 @@ tests = []
[dependencies]
async-trait = "0.1.68"
derive_more = { version = "0.99.17", default-features = false, features = ["display", "from", "error"] }
log = "0.4.17"
serde = { version = "1.0.159", features = ["derive"] }
log = "0.4.18"
serde = { version = "1.0.163", features = ["derive"] }
[dev-dependencies]
env_logger = "0.10.0"
test-log = "0.2.11"
tokio = { version = "1.27.0", features = ["full"] }
tokio = { version = "1.28.2", features = ["full"] }

14
distant-core/Cargo.toml
Unescape Escape View File

@ -13,23 +13,23 @@ license = "MIT OR Apache-2.0"
[dependencies]
async-trait = "0.1.68"
bitflags = "2.0.2"
bitflags = "2.3.1"
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.7", path = "../distant-net" }
distant-protocol = { version = "=0.20.0-alpha.7", path = "../distant-protocol" }
futures = "0.3.28"
hex = "0.4.3"
log = "0.4.17"
log = "0.4.18"
num_cpus = "1.15.0"
once_cell = "1.17.1"
once_cell = "1.17.2"
rand = { version = "0.8.5", features = ["getrandom"] }
regex = "1.7.3"
serde = { version = "1.0.159", features = ["derive"] }
regex = "1.8.3"
serde = { version = "1.0.163", features = ["derive"] }
serde_bytes = "0.11.9"
serde_json = "1.0.95"
serde_json = "1.0.96"
strum = { version = "0.24.1", features = ["derive"] }
tokio = { version = "1.27.0", features = ["full"] }
tokio = { version = "1.28.2", features = ["full"] }
[dev-dependencies]
env_logger = "0.10.0"

12
distant-local/Cargo.toml
Unescape Escape View File

@ -13,24 +13,24 @@ license = "MIT OR Apache-2.0"
[dependencies]
async-trait = "0.1.68"
distant-core = { version = "=0.20.0-alpha.7", path = "../distant-core" }
grep = "0.2.11"
grep = "0.2.12"
ignore = "0.4.20"
log = "0.4.17"
log = "0.4.18"
notify = { version = "6.0.0", features = ["serde"] }
num_cpus = "1.15.0"
portable-pty = "0.8.1"
rand = { version = "0.8.5", features = ["getrandom"] }
shell-words = "1.1.0"
tokio = { version = "1.27.0", features = ["full"] }
tokio = { version = "1.28.2", features = ["full"] }
walkdir = "2.3.3"
whoami = "1.4.0"
winsplit = "0.1.0"
[dev-dependencies]
assert_fs = "1.0.12"
assert_fs = "1.0.13"
env_logger = "0.10.0"
indoc = "2.0.1"
once_cell = "1.17.1"
predicates = "3.0.2"
once_cell = "1.17.2"
predicates = "3.0.3"
rstest = "0.17.0"
test-log = "0.2.11"

12
distant-net/Cargo.toml
Unescape Escape View File

@ -18,23 +18,23 @@ 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"] }
distant-auth = { version = "=0.20.0-alpha.7", path = "../distant-auth" }
dyn-clone = "1.0.11"
flate2 = "1.0.25"
flate2 = "1.0.26"
hex = "0.4.3"
hkdf = "0.12.3"
log = "0.4.17"
log = "0.4.18"
paste = "1.0.12"
p256 = { version = "0.13.0", features = ["ecdh", "pem"] }
p256 = { version = "0.13.2", features = ["ecdh", "pem"] }
rand = { version = "0.8.5", features = ["getrandom"] }
rmp-serde = "1.1.1"
sha2 = "0.10.6"
serde = { version = "1.0.159", features = ["derive"] }
serde = { version = "1.0.163", features = ["derive"] }
serde_bytes = "0.11.9"
strum = { version = "0.24.1", features = ["derive"] }
tokio = { version = "1.27.0", features = ["full"] }
tokio = { version = "1.28.2", features = ["full"] }
[dev-dependencies]
distant-auth = { version = "=0.20.0-alpha.7", path = "../distant-auth", features = ["tests"] }
env_logger = "0.10.0"
serde_json = "1.0.95"
serde_json = "1.0.96"
tempfile = "3.5.0"
test-log = "0.2.11"

6
distant-protocol/Cargo.toml
Unescape Escape View File

@ -16,10 +16,10 @@ default = []
tests = []
[dependencies]
bitflags = "2.0.2"
bitflags = "2.3.1"
derive_more = { version = "0.99.17", default-features = false, features = ["deref", "deref_mut", "display", "from", "error", "into", "into_iterator", "is_variant"] }
regex = "1.7.3"
serde = { version = "1.0.159", features = ["derive"] }
regex = "1.8.3"
serde = { version = "1.0.163", features = ["derive"] }
serde_bytes = "0.11.9"
strum = { version = "0.24.1", features = ["derive"] }

18
distant-ssh2/Cargo.toml
Unescape Escape View File

@ -17,33 +17,33 @@ ssh2 = ["wezterm-ssh/ssh2", "wezterm-ssh/vendored-openssl-ssh2"]
[dependencies]
async-compat = "0.2.1"
async-once-cell = "0.4.4"
async-once-cell = "0.5.2"
async-trait = "0.1.68"
derive_more = { version = "0.99.17", default-features = false, features = ["display", "error"] }
distant-core = { version = "=0.20.0-alpha.7", path = "../distant-core" }
futures = "0.3.28"
hex = "0.4.3"
log = "0.4.17"
log = "0.4.18"
rand = { version = "0.8.5", features = ["getrandom"] }
rpassword = "7.2.0"
shell-words = "1.1.0"
smol = "1.3.0"
tokio = { version = "1.27.0", features = ["full"] }
tokio = { version = "1.28.2", 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.159", features = ["derive"], optional = true }
serde = { version = "1.0.163", features = ["derive"], optional = true }
[dev-dependencies]
anyhow = "1.0.70"
assert_fs = "1.0.12"
dunce = "1.0.3"
anyhow = "1.0.71"
assert_fs = "1.0.13"
dunce = "1.0.4"
env_logger = "0.10.0"
indoc = "2.0.1"
once_cell = "1.17.1"
predicates = "3.0.2"
once_cell = "1.17.2"
predicates = "3.0.3"
rstest = "0.17.0"
test-log = "0.2.11"
which = "4.4.0"

7
src/cli/commands/client.rs
Unescape Escape View File

@ -13,9 +13,10 @@ use distant_core::protocol::{
use distant_core::{DistantChannel, DistantChannelExt, RemoteCommand, Searcher, Watcher};
use log::*;
use serde_json::json;
use tabled::object::Rows;
use tabled::style::Style;
use tabled::{Alignment, Disable, Modify, Table, Tabled};
use tabled::settings::object::Rows;
use tabled::settings::style::Style;
use tabled::settings::{Alignment, Disable, Modify};
use tabled::{Table, Tabled};
use tokio::sync::mpsc;
use crate::cli::common::{

7
src/cli/commands/common/format.rs
Unescape Escape View File

@ -8,9 +8,10 @@ use distant_core::protocol::{
SearchQueryPathMatch, SystemInfo,
};
use log::*;
use tabled::object::Rows;
use tabled::style::Style;
use tabled::{Alignment, Disable, Modify, Table, Tabled};
use tabled::settings::object::Rows;
use tabled::settings::style::Style;
use tabled::settings::{Alignment, Disable, Modify};
use tabled::{Table, Tabled};
use crate::options::Format;

Write Preview
Loading…
Cancel
Save