From 36ab821d2cb7720784af3a01ec6a0a1c4798e13b Mon Sep 17 00:00:00 2001 From: Arijit Basu Date: Fri, 4 Jun 2021 21:39:14 +0530 Subject: [PATCH] Upgrade dependencies Closes: https://github.com/sayanarijit/xplr/issues/187 --- Cargo.lock | 116 +++++++++++-------------------------------- Cargo.toml | 22 ++++---- benches/criterion.rs | 1 - src/event_reader.rs | 27 +++++----- src/init.lua | 5 +- src/runner.rs | 1 - 6 files changed, 55 insertions(+), 117 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7a760e8..51377e8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "ansi-to-tui" -version = "0.2.0" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc671d766fb75259578ba58f2e492333693c5b028e6b345cc1ac49dfd4d71b95" +checksum = "78688ae13e204ce559701516a0198d5fb54530b73eb1b3ecf404b4b79ed48dbf" dependencies = [ "tui", ] @@ -17,18 +17,6 @@ version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28b2cd92db5cbd74e8e5028f7e27dd7aa3090e89e4f2a197cc7c8dfb69c7063b" -[[package]] -name = "arrayref" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" - -[[package]] -name = "arrayvec" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" - [[package]] name = "atty" version = "0.2.14" @@ -46,29 +34,12 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" -[[package]] -name = "base64" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" - [[package]] name = "bitflags" version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" -[[package]] -name = "blake2b_simd" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" -dependencies = [ - "arrayref", - "arrayvec", - "constant_time_eq", -] - [[package]] name = "bstr" version = "0.2.15" @@ -145,12 +116,6 @@ dependencies = [ "unicode-width", ] -[[package]] -name = "constant_time_eq" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "245097e9a4535ee1e3e3931fcfcd55a796a44c643e8596ff6566d68f09b87bbc" - [[package]] name = "criterion" version = "0.3.4" @@ -234,9 +199,9 @@ dependencies = [ [[package]] name = "crossterm" -version = "0.18.2" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e86d73f2a0b407b5768d10a8c720cf5d2df49a9efc10ca09176d201ead4b7fb" +checksum = "7c36c10130df424b2f3552fcc2ddcd9b28a27b1e54b358b45874f88d1ca6888c" dependencies = [ "bitflags", "crossterm_winapi", @@ -250,9 +215,9 @@ dependencies = [ [[package]] name = "crossterm_winapi" -version = "0.6.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2265c3f8e080075d9b6417aa72293fc71662f34b4af2612d8d1b074d29510db" +checksum = "0da8964ace4d3e4a044fd027919b2237000b24315a37c916f61809f1ff2140b9" dependencies = [ "winapi", ] @@ -281,18 +246,18 @@ dependencies = [ [[package]] name = "dirs" -version = "3.0.1" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "142995ed02755914747cc6ca76fc7e4583cd18578746716d0508ea6ed558b9ff" +checksum = "30baa043103c9d0c2a57cf537cc2f35623889dc0d405e6c3cccfadbc81c71309" dependencies = [ "dirs-sys", ] [[package]] name = "dirs-sys" -version = "0.3.5" +version = "0.3.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e93d7f5705de3e49895a2b5e0b8855a1c27f080192ae9c32a6432d50741a57a" +checksum = "03d86534ed367a67548dc68113a0f5db55432fdfbb6e6f9d77704397d95d5780" dependencies = [ "libc", "redox_users", @@ -322,13 +287,13 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.1.16" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" dependencies = [ "cfg-if", "libc", - "wasi 0.9.0+wasi-snapshot-preview1", + "wasi", ] [[package]] @@ -419,9 +384,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.94" +version = "0.2.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18794a8ad5b29321f790b55d93dfba91e125cb1a9edbd4f8e3150acc771c1a5e" +checksum = "789da6d93f1b866ffe175afc5322a4d76c038605a1c3319bb57b06967ca98a36" [[package]] name = "linked-hash-map" @@ -611,7 +576,7 @@ dependencies = [ "cfg-if", "instant", "libc", - "redox_syscall 0.2.5", + "redox_syscall", "smallvec", "winapi", ] @@ -693,12 +658,6 @@ dependencies = [ "num_cpus", ] -[[package]] -name = "redox_syscall" -version = "0.1.57" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" - [[package]] name = "redox_syscall" version = "0.2.5" @@ -714,18 +673,17 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8440d8acb4fd3d277125b4bd01a6f38aee8d814b3b5fc09b3f2b825d37d3fe8f" dependencies = [ - "redox_syscall 0.2.5", + "redox_syscall", ] [[package]] name = "redox_users" -version = "0.3.5" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de0737333e7a9502c789a36d7c7fa6092a49895d4faa31ca5df163857ded2e9d" +checksum = "528532f3d801c87aec9def2add9ca802fe569e44a544afe633765267840abe64" dependencies = [ "getrandom", - "redox_syscall 0.1.57", - "rust-argon2", + "redox_syscall", ] [[package]] @@ -752,18 +710,6 @@ version = "0.6.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5f089152e60f62d28b835fbff2cd2e8dc0baf1ac13343bef92ab7eed84548" -[[package]] -name = "rust-argon2" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b18820d944b33caa75a71378964ac46f58517c92b6ae5f762636247c09e78fb" -dependencies = [ - "base64", - "blake2b_simd", - "constant_time_eq", - "crossbeam-utils", -] - [[package]] name = "rustc_version" version = "0.2.3" @@ -811,9 +757,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.125" +version = "1.0.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "558dc50e1a5a5fa7112ca2ce4effcb321b0300c0d4ccf0776a9f60cd89031171" +checksum = "ec7505abeacaec74ae4778d9d9328fe5a5d04253220a85c4ee022239fc996d03" dependencies = [ "serde_derive", ] @@ -830,9 +776,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.125" +version = "1.0.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b093b7a2bb58203b5da3056c05b4ec1fed827dcfdb37347a8841695263b3d06d" +checksum = "963a7dbc9895aeac7ac90e74f34a5d5261828f79df35cbed41e10189d3804d43" dependencies = [ "proc-macro2", "quote", @@ -907,7 +853,7 @@ checksum = "077185e2eac69c3f8379a4298e1e07cd36beb962290d4a51199acf0fdc10607e" dependencies = [ "libc", "numtoa", - "redox_syscall 0.2.5", + "redox_syscall", "redox_termios", ] @@ -927,7 +873,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" dependencies = [ "libc", - "wasi 0.10.0+wasi-snapshot-preview1", + "wasi", "winapi", ] @@ -943,9 +889,9 @@ dependencies = [ [[package]] name = "tui" -version = "0.14.0" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ced152a8e9295a5b168adc254074525c17ac4a83c90b2716274cc38118bddc9" +checksum = "861d8f3ad314ede6219bcb2ab844054b1de279ee37a9bc38e3d606f9d3fb2a71" dependencies = [ "bitflags", "cassowary", @@ -999,12 +945,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - [[package]] name = "wasi" version = "0.10.0+wasi-snapshot-preview1" diff --git a/Cargo.toml b/Cargo.toml index 7de3d43..c9394a0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,22 +15,22 @@ categories = ["command-line-interface", "command-line-utilities"] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -tui = { version = "0.14", default-features = false, features = ['crossterm', 'serde'] } -termion = "1.5" -crossterm = "0.18" -dirs = "3.0.1" -serde = { version = "1.0", features = ["derive"] } -serde_yaml = "0.8" +tui = { version = "0.15.0", default-features = false, features = ['crossterm', 'serde'] } +termion = "1.5.6" +crossterm = "0.19.0" +dirs = "3.0.2" +serde = { version = "1.0.126", features = ["derive"] } +serde_yaml = "0.8.17" mime_guess = "2.0.3" -anyhow = "1.0" -chrono = { version = "0.4", features = ["serde"] } +anyhow = "1.0.40" +chrono = { version = "0.4.19", features = ["serde"] } lazy_static = "1.4.0" indexmap = { version = "1.6.2", features = ["serde"] } natord = "1.0.9" -humansize = "1.1.0" +humansize = "1.1.1" mlua = { version = "0.5.4", features = ["luajit", "vendored", "serialize", "send"] } -ansi-to-tui = "0.2.0" -libc = "0.2.94" +ansi-to-tui = "0.3.0" +libc = "0.2.95" [dev-dependencies] criterion = "0.3" diff --git a/benches/criterion.rs b/benches/criterion.rs index 7a33b02..9ad5b73 100644 --- a/benches/criterion.rs +++ b/benches/criterion.rs @@ -4,7 +4,6 @@ use criterion::{criterion_group, criterion_main, Criterion}; use crossterm::execute; use crossterm::terminal as term; use std::fs; -use std::io::prelude::*; use termion::get_tty; use tui::backend::CrosstermBackend; use tui::Terminal; diff --git a/src/event_reader.rs b/src/event_reader.rs index 60ddf47..8f44de9 100644 --- a/src/event_reader.rs +++ b/src/event_reader.rs @@ -1,7 +1,7 @@ use crate::app::Task; use crate::app::{ExternalMsg, InternalMsg, MsgIn}; use crate::input::Key; -use crossterm::event::{self, Event, MouseEvent}; +use crossterm::event::{self, Event, MouseEventKind}; use std::sync::mpsc::{Receiver, Sender}; use std::thread; @@ -19,16 +19,6 @@ pub fn keep_reading(tx_msg_in: Sender, rx_event_reader: Receiver) { // NOTE: The poll timeout need to stay low, else spawning sub subshell // and start typing immediately will cause panic. match event::read() { - Ok(Event::Mouse(MouseEvent::ScrollUp(_, _, _))) => { - let msg = MsgIn::External(ExternalMsg::FocusPrevious); - tx_msg_in.send(Task::new(msg, None)).unwrap_or_default(); - } - - Ok(Event::Mouse(MouseEvent::ScrollDown(_, _, _))) => { - let msg = MsgIn::External(ExternalMsg::FocusNext); - tx_msg_in.send(Task::new(msg, None)).unwrap_or_default(); - } - Ok(Event::Key(key)) => { let key = Key::from_event(key); let msg = MsgIn::Internal(InternalMsg::HandleKey(key)); @@ -37,13 +27,24 @@ pub fn keep_reading(tx_msg_in: Sender, rx_event_reader: Receiver) { .unwrap_or_default(); } + Ok(Event::Mouse(evt)) => match evt.kind { + MouseEventKind::ScrollUp => { + let msg = MsgIn::External(ExternalMsg::FocusPrevious); + tx_msg_in.send(Task::new(msg, None)).unwrap_or_default(); + } + + MouseEventKind::ScrollDown => { + let msg = MsgIn::External(ExternalMsg::FocusNext); + tx_msg_in.send(Task::new(msg, None)).unwrap_or_default(); + } + _ => {} + }, + Ok(Event::Resize(_, _)) => { let msg = MsgIn::External(ExternalMsg::Refresh); tx_msg_in.send(Task::new(msg, None)).unwrap_or_default(); } - Ok(_) => {} - Err(e) => { tx_msg_in .send(Task::new( diff --git a/src/init.lua b/src/init.lua index 9a2fba2..405e924 100644 --- a/src/init.lua +++ b/src/init.lua @@ -279,7 +279,7 @@ xplr.config.general.table.col_widths = { xplr.config.general.table.header.cols = { { format = " index", style = { add_modifiers = nil, bg = nil, fg = nil, sub_modifiers = nil } }, { format = "╭──── path", style = { add_modifiers = nil, bg = nil, fg = nil, sub_modifiers = nil } }, - { format = " permissions", style = { add_modifiers = nil, bg = nil, fg = nil, sub_modifiers = nil } }, + { format = "permissions", style = { add_modifiers = nil, bg = nil, fg = nil, sub_modifiers = nil } }, { format = "size", style = { add_modifiers = nil, bg = nil, fg = nil, sub_modifiers = nil } }, { format = "type", style = { add_modifiers = nil, bg = nil, fg = nil, sub_modifiers = nil } }, } @@ -2066,8 +2066,7 @@ xplr.fn.builtin.fmt_general_table_row_cols_2 = function(m) local p = m.permissions - -- TODO: Track https://github.com/uttarayan21/ansi-to-tui/issues/3 - local r = " " + local r = "" -- User r = r .. bit("r", green, p.user_read) diff --git a/src/runner.rs b/src/runner.rs index b37c65f..830aef2 100644 --- a/src/runner.rs +++ b/src/runner.rs @@ -15,7 +15,6 @@ use crossterm::terminal as term; use mlua::LuaSerdeExt; use std::fs; use std::io; -use std::io::prelude::*; use std::path::PathBuf; use std::process::{Command, ExitStatus, Stdio}; use std::sync::mpsc;