diff --git a/CHANGELOG.md b/CHANGELOG.md index 628fd00..9f3718d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -23,6 +23,13 @@ FIXME: Released on - Bugfix: - Solved file index in explorer files at start of termscp, in case the first entry is an hidden file - SCP File transfer: when listing directory entries, check if a symlink points to a directory or to a file +- Dependencies: + - updated `crossterm` to `0.19.0` + - updated `rand` to `0.8.2` + - updated `rpassword` to `5.0.1` + - updated `serde` to `1.0.121` + - updated `tui` to `0.14.0` + - updated `whoami` to `1.1.0` ## 0.3.1 diff --git a/Cargo.lock b/Cargo.lock index 104c0b1..d3375e3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -128,9 +128,9 @@ checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" [[package]] name = "bumpalo" -version = "3.4.0" +version = "3.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e8c087f005730276d1096a652e92a8bacee2e2472bcc9715a74d2bec38b5820" +checksum = "f07aa6688c702439a1be0307b6a94dffe1168569e45b9500c1372bc580740d59" [[package]] name = "byte-tools" @@ -291,7 +291,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4e86d73f2a0b407b5768d10a8c720cf5d2df49a9efc10ca09176d201ead4b7fb" dependencies = [ "bitflags", - "crossterm_winapi", + "crossterm_winapi 0.6.2", + "lazy_static", + "libc", + "mio", + "parking_lot 0.11.1", + "signal-hook", + "winapi", +] + +[[package]] +name = "crossterm" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c36c10130df424b2f3552fcc2ddcd9b28a27b1e54b358b45874f88d1ca6888c" +dependencies = [ + "bitflags", + "crossterm_winapi 0.7.0", "lazy_static", "libc", "mio", @@ -309,6 +325,15 @@ dependencies = [ "winapi", ] +[[package]] +name = "crossterm_winapi" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0da8964ace4d3e4a044fd027919b2237000b24315a37c916f61809f1ff2140b9" +dependencies = [ + "winapi", +] + [[package]] name = "crypto-mac" version = "0.10.0" @@ -470,9 +495,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4060f4657be78b8e766215b02b18a2e862d83745545de804638e2b545e81aee6" +checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8" dependencies = [ "cfg-if 1.0.0", "libc", @@ -598,9 +623,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.11" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" +checksum = "fcf3805d4480bb5b86070dcfeb9e2cb2ebc148adb753c5cca5f884d1d65a42b2" dependencies = [ "cfg-if 0.1.10", ] @@ -772,6 +797,12 @@ dependencies = [ "autocfg", ] +[[package]] +name = "once_cell" +version = "1.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0" + [[package]] name = "opaque-debug" version = "0.3.0" @@ -841,7 +872,7 @@ dependencies = [ "cfg-if 0.1.10", "cloudabi", "libc", - "redox_syscall", + "redox_syscall 0.1.57", "smallvec", "winapi", ] @@ -855,7 +886,7 @@ dependencies = [ "cfg-if 1.0.0", "instant", "libc", - "redox_syscall", + "redox_syscall 0.1.57", "smallvec", "winapi", ] @@ -905,9 +936,9 @@ dependencies = [ [[package]] name = "rand" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c24fcd450d3fa2b592732565aa4f17a27a61c65ece4726353e000939b0edee34" +checksum = "18519b42a40024d661e1714153e9ad0c3de27cd495760ceb09710920f1098b1e" dependencies = [ "libc", "rand_chacha 0.3.0", @@ -950,7 +981,7 @@ version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c026d7df8b298d90ccbbc5190bd04d85e159eaf5576caeacf8741da93ccbd2e5" dependencies = [ - "getrandom 0.2.1", + "getrandom 0.2.2", ] [[package]] @@ -977,6 +1008,15 @@ version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" +[[package]] +name = "redox_syscall" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05ec8ca9416c5ea37062b502703cd7fcb207736bc294f6e0cf367ac6fc234570" +dependencies = [ + "bitflags", +] + [[package]] name = "redox_users" version = "0.3.5" @@ -984,7 +1024,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" dependencies = [ "getrandom 0.1.16", - "redox_syscall", + "redox_syscall 0.1.57", "rust-argon2", ] @@ -1017,9 +1057,9 @@ dependencies = [ [[package]] name = "rpassword" -version = "5.0.0" +version = "5.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d755237fc0f99d98641540e66abac8bc46a0652f19148ac9e21de2da06b326c9" +checksum = "ffc936cf8a7ea60c58f030fd36a612a48f440610214dc54bc36431f9ea0c3efb" dependencies = [ "libc", "winapi", @@ -1117,18 +1157,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.118" +version = "1.0.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06c64263859d87aa2eb554587e2d23183398d617427327cf2b3d0ed8c69e4800" +checksum = "6159e3c76cab06f6bc466244d43b35e77e9500cd685da87620addadc2a4c40b1" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.118" +version = "1.0.121" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c84d3526699cd55261af4b941e4e725444df67aa4f9e6a3564f18030d12672df" +checksum = "f3fcab8778dc651bc65cfab2e4eb64996f3c912b74002fb379c94517e1f27c46" dependencies = [ "proc-macro2", "quote", @@ -1211,9 +1251,9 @@ checksum = "1e81da0851ada1f3e9d4312c704aa4f8806f0f9d69faaf8df2f3464b4a9437c2" [[package]] name = "syn" -version = "1.0.58" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc60a3d73ea6594cd712d830cc1f0390fd71542d8c8cd24e70cc54cdfd5e05d5" +checksum = "07cb8b1b4ebf86a89ee88cbd201b022b94138c623644d035185c84d3f41b7e66" dependencies = [ "proc-macro2", "quote", @@ -1222,14 +1262,14 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.1.0" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" +checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" dependencies = [ - "cfg-if 0.1.10", + "cfg-if 1.0.0", "libc", - "rand 0.7.3", - "redox_syscall", + "rand 0.8.2", + "redox_syscall 0.2.4", "remove_dir_all", "winapi", ] @@ -1242,7 +1282,7 @@ dependencies = [ "bytesize", "chrono", "content_inspector", - "crossterm", + "crossterm 0.19.0", "dirs", "edit", "ftp4", @@ -1251,7 +1291,7 @@ dependencies = [ "keyring", "lazy_static", "magic-crypt", - "rand 0.8.1", + "rand 0.8.2", "regex", "rpassword", "serde", @@ -1277,11 +1317,11 @@ dependencies = [ [[package]] name = "thread_local" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb9bc092d0d51e76b2b19d9d85534ffc9ec2db959a2523cdae0697e2972cd447" +checksum = "301bdd13d23c49672926be451130892d274d3ba0b410c18e00daa7990ff38d99" dependencies = [ - "lazy_static", + "once_cell", ] [[package]] @@ -1317,13 +1357,13 @@ dependencies = [ [[package]] name = "tui" -version = "0.13.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d4e6c82bb967df89f20b875fa8835fab5d5622c6a5efa574a1f0b6d0aa6e8f6" +checksum = "9ced152a8e9295a5b168adc254074525c17ac4a83c90b2716274cc38118bddc9" dependencies = [ "bitflags", "cassowary", - "crossterm", + "crossterm 0.18.2", "unicode-segmentation", "unicode-width", ] @@ -1461,9 +1501,9 @@ dependencies = [ [[package]] name = "whoami" -version = "1.0.3" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d595b2e146f36183d6a590b8d41568e2bc84c922267f43baf61c956330eeb436" +checksum = "1a921c0ad578a51c0b6c0bbb9b95f0ed11e90d61da506139e48a946edd11ee1e" dependencies = [ "wasm-bindgen", "web-sys", diff --git a/Cargo.toml b/Cargo.toml index dc4645c..29f8081 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -20,7 +20,7 @@ bitflags = "1.2.1" bytesize = "1.0.1" chrono = "0.4.19" content_inspector = "0.2.4" -crossterm = "0.18.2" +crossterm = "0.19.0" dirs = "3.0.1" edit = "0.1.2" ftp4 = { version = "^4.0.2", features = ["secure"] } @@ -28,17 +28,17 @@ getopts = "0.2.21" hostname = "0.3.1" lazy_static = "1.4.0" magic-crypt = "3.1.6" -rand = "0.8.0" +rand = "0.8.2" regex = "1.4.2" -rpassword = "5.0.0" -serde = { version = "1.0.118", features = ["derive"] } +rpassword = "5.0.1" +serde = { version = "1.0.121", features = ["derive"] } ssh2 = "0.9.0" tempfile = "3.1.0" textwrap = "0.13.1" toml = "0.5.8" -tui = { version = "0.13.0", features = ["crossterm"], default-features = false } +tui = { version = "0.14.0", features = ["crossterm"], default-features = false } unicode-width = "0.1.7" -whoami = "1.0.1" +whoami = "1.1.0" [target.'cfg(any(target_os = "unix", target_os = "macos", target_os = "linux"))'.dependencies] users = "0.11.0" diff --git a/src/ui/context.rs b/src/ui/context.rs index 1e68941..01842bc 100644 --- a/src/ui/context.rs +++ b/src/ui/context.rs @@ -35,7 +35,7 @@ use crate::host::Localhost; use crossterm::event::DisableMouseCapture; use crossterm::execute; use crossterm::terminal::{EnterAlternateScreen, LeaveAlternateScreen}; -use std::io::{stdout, Stdout, Write}; +use std::io::{stdout, Stdout}; use tui::backend::CrosstermBackend; use tui::Terminal;