Merge pull request #29 from ethankhall/update-versions

Update versions

Author: ethankhall

Cargo.lock

@@ -5,27 +5,28 @@ authors = ["Ethan Hall <ethankhall@pm.me>"]
 edition = "2018"
 
 [dependencies]
-log = "0.4.1"
+log = "0.4"
 fern = { version = "0.5", features = ["colored"] }
 clap = { version = "2.32", features = ["yaml"] }
 colored = "1.6"
 chrono = "0.4"
 chrono-tz = "0.5"
-serde = "1.0.80"
-serde_json = "1.0.33"
-serde_derive = "1.0.80"
+serde = "1.0"
+serde_json = "1.0"
+serde_derive = "1.0"
 url = "1.7"
 regex = "1"
 mime = "0.3"
 comrak = "0.4"
 json = "*"
-indicatif = "0.10"
+indicatif = "0.11"
 ratelimit = "0.4"
 reqwest = { version = "0.9", features = ["rustls-tls"] }
 crossbeam-channel = "0.3"
 kopy-common-lib = { git = "https://github.com/ethankhall/rust-shared.git", rev = "84a38d080b5a066c7443e6a46e043708d2a53f39" }
 prettytable-rs = "0.8"
-termion = "*"
+crossterm = "0.10"
+crossterm_screen = "0.2"
 lazy_static = "*"
 flate2 = "1.0"
 atty = "0.2"

Cargo.toml

@@ -33,7 +33,10 @@ jobs:
     steps:
       - script: |
           set -e
-          curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain nightly -y
+          curl https://sh.rustup.rs -sSf | sh -s -- -y
+          source $HOME/.cargo/env
+          rustup toolchain install 1.36.0
+          rustup default 1.36.0
           mkdir ~/bin
           curl --location https://github.com/ethankhall/crom/releases/download/v0.1.14/crom-mac.tar.gz | tar -xvz  -C ~/bin
           chmod +x ~/bin/crom

azure-pipelines.yml

@@ -1,4 +1,4 @@
-FROM ekidd/rust-musl-builder:nightly
+FROM ekidd/rust-musl-builder:1.36.0
 
 RUN mkdir ~/bin
 RUN curl --location https://github.com/ethankhall/crom/releases/download/v0.1.13/crom-linux-musl.tar.gz | tar -xvz  -C ~/bin

ci/musl-builder.Dockerfile

@@ -164,15 +164,15 @@ fn validate_ast_builder() {
 
     assert_eq!(
         SqlOperation::Select {
-            columns: vec![s!("*")]
+            columns: vec![s!("*")],
         },
         expression.operation
     );
     assert_eq!(SqlSource::SqlFrom { path: s!(".") }, expression.source);
     assert_eq!(
         vec![SqlFilter::Condition(SqlComparison::Equal {
             path: s!(".a.b.c"),
-            value: s!("123")
+            value: s!("123"),
         })],
         expression.filter
     );

src/commands/json/sql/parser.rs

@@ -1,12 +1,12 @@
 use std::collections::BTreeMap;
-use std::io::{stdout, Stdout, Write};
+use std::io::Write;
 use std::{thread, time};
 
 use chrono::prelude::*;
 use clap::ArgMatches;
 use colored::*;
+use crossterm::{terminal, ClearType, Terminal};
 use prettytable::{format, Table};
-use termion::screen::*;
 
 use crate::commands::nsq::api::*;
 use crate::commands::CliError;
@@ -73,22 +73,22 @@ pub fn do_stats_command(matches: &ArgMatches) -> Result<(), CliError> {
 }
 
 fn do_loop(config: &ConfigOptions, state: NsqState) {
-    let mut screen = AlternateScreen::from(stdout());
+    let mut terminal = terminal();
     let mut counter = 0;
     let mut last_data = None;
     let mut buffer_size: i32 = -1;
     let mut snapshot = state.update_status();
 
     loop {
         if buffer_size > 0 {
-            write!(screen, "{}", termion::cursor::Up(buffer_size as u16),).unwrap();
+            terminal.scroll_up(buffer_size as i16).unwrap();
         }
 
-        let last_buffer_size = print_report(&config, &snapshot, last_data, &mut screen) as i32;
+        let last_buffer_size = print_report(&config, &snapshot, last_data, &mut terminal) as i32;
         last_data = Some(snapshot);
 
         buffer_size = std::cmp::max(buffer_size, last_buffer_size);
-        write!(screen, "{}", termion::clear::AfterCursor).unwrap();
+        terminal.clear(ClearType::FromCursorDown).unwrap();
 
         let poll_start = Local::now();
         snapshot = state.update_status();
@@ -118,7 +118,7 @@ fn print_report(
     config_options: &ConfigOptions,
     current: &NsqSnapshot,
     last_data: Option<NsqSnapshot>,
-    screen: &mut AlternateScreen<Stdout>,
+    screen: &mut Terminal,
 ) -> usize {
     let mut buffer: Vec<u8> = Vec::new();
 
@@ -127,8 +127,7 @@ fn print_report(
         "Polled at {} (UTC: {})",
         s!(current.pull_finished).bold(),
         s!(current.pull_finished.with_timezone(&Utc)).bold()
-    )
-    .unwrap();
+    ).unwrap();
 
     for (topic_name, host_table) in make_host_table(&current, &last_data) {
         writeln!(buffer, "\n📇 {}", topic_name.bold()).unwrap();
@@ -148,13 +147,10 @@ fn print_report(
     let line_buffer = buffer.split(|x| x == &('\n' as u8));
     for line in line_buffer {
         lines += 1;
-        writeln!(
-            screen,
-            "{}{}",
-            String::from_utf8(line.to_vec()).unwrap(),
-            termion::clear::UntilNewline
-        )
-        .unwrap();
+        screen
+            .write(String::from_utf8(line.to_vec()).unwrap())
+            .unwrap();
+        screen.clear(ClearType::UntilNewLine).unwrap();
     }
 
     lines
@@ -249,9 +245,8 @@ fn make_host_table(current: &NsqSnapshot, last: &Option<NsqSnapshot>) -> BTreeMa
                 let change = aggregate.message_count as u128 - last_aggregate.message_count as u128;
                 table.add_row(row!["Change", "", change]);
                 let mps = change as f64;
-                let mps = mps
-                    / (current.pull_finished - previous_stats.pull_finished).num_milliseconds()
-                        as f64;
+                let mps = mps / (current.pull_finished - previous_stats.pull_finished)
+                    .num_milliseconds() as f64;
                 let mps = mps * 1000 as f64;
                 table.add_row(row!["Rate", "", format!("{:.2} m/s", mps)]);
             }

src/commands/nsq/stats.rs

@@ -1,5 +1,3 @@
-use std::slice::SliceConcatExt;
-
 mod parse;
 
 use clap::ArgMatches;
@@ -48,8 +46,7 @@ fn render_full_output(input: TimeResult) -> Result<(), CliError> {
                 datetime.month(),
                 datetime.day(),
                 datetime.year()
-            )
-            .bold()
+            ).bold()
         );
         println!(
             "  ├── Date in YMD: {}",
@@ -58,8 +55,7 @@ fn render_full_output(input: TimeResult) -> Result<(), CliError> {
                 datetime.year(),
                 datetime.month(),
                 datetime.day()
-            )
-            .bold()
+            ).bold()
         );
         println!(
             "  ├── Day in year: {}",
@@ -71,8 +67,7 @@ fn render_full_output(input: TimeResult) -> Result<(), CliError> {
                 "{}-{}",
                 datetime.iso_week().year(),
                 datetime.iso_week().week()
-            )
-            .bold()
+            ).bold()
         );
         println!(
             "  ├── Day of week: {}",

src/commands/time/mod.rs

@@ -363,7 +363,10 @@ fn assert_contains_date(time_results: &TimeResult, required: &[CalendarDate]) {
             ut,
             dates
         );
-        dates.remove_item(&ut);
+        dates
+            .iter()
+            .position(|item| ut == item)
+            .map(|i| dates.remove(i));
     }
 
     assert_eq!(0, dates.len());

src/commands/time/parse.rs

@@ -1,7 +1,3 @@
-#![recursion_limit = "1024"]
-#![feature(slice_concat_ext)]
-#![feature(vec_remove_item)]
-
 extern crate chrono;
 extern crate chrono_tz;
 extern crate colored;
@@ -23,7 +19,7 @@ extern crate log;
 extern crate kopy_common_lib;
 #[macro_use]
 extern crate prettytable;
-extern crate termion;
+extern crate crossterm;
 #[macro_use]
 extern crate lazy_static;
 extern crate atty;