Rust 2021, clippy clean, cargo fmt, replaced std::sync primitives (#140)

virtualritz · tarkah · web-flow · commit f602f249e4ee · 2023-02-22T09:02:21.000-08:00
* Rust 2021, clipp clean, cargo fmt, swapped std::sync primitives for rclite &amp; parking_lot alternatives.

* Use static ssl

---------

Co-authored-by: Cory Forsstrom &lt;cforsstrom18@gmail.com&gt;
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -2,12 +2,12 @@
 name = "tickrs"
 version = "0.14.6"
 authors = ["tarkah <admin@tarkah.dev>"]
-edition = "2018"
+edition = "2021"
 license = "MIT"
 repository = "https://github.com/tarkah/tickrs"
 readme = "README.md"
 description = "Realtime ticker data in your terminal 📈"
-keywords = ["tui","terminal","stocks"]
+keywords = ["tui", "terminal", "stocks"]
 categories = ["command-line-utilities"]
 
 [profile.release]
@@ -20,22 +20,20 @@ members = [
 ]
 
 [dependencies]
-tickrs-api = { path = "api/", version = "0.14.6" }
-
 anyhow = "1.0"
-crossbeam-channel = "0.4"
+async-std = "1.12"
+better-panic = "0.3"
 chrono = "0.4"
-chrono-tz = "0.5"
+crossbeam-channel = "0.5"
+crossterm = "0.25" # use the same version as tui
 dirs-next = "2.0.0"
-itertools = "0.9"
+futures = "0.3"
+itertools = "0.10"
 lazy_static = "1.4"
+parking_lot = "0.12.1"
+rclite = "0.1.5"
 serde = { version = "1", features = ["derive"] }
-serde_yaml = "0.8"
+serde_yaml = "0.9"
 structopt = "0.3"
-
-async-std = "1.5"
-futures = "0.3"
-
-better-panic = "0.2"
-crossterm = "0.19"
-tui = { version = "0.14", default-features = false, features = ["crossterm","serde"] }
+tickrs-api = { path = "api/", version = "0.14.6" }
+tui = { version = "0.19", default-features = false, features = ["crossterm","serde"] }
diff --git a/api/Cargo.toml b/api/Cargo.toml
@@ -2,24 +2,19 @@
 name = "tickrs-api"
 version = "0.14.6"
 authors = ["tarkah <admin@tarkah.dev>"]
-edition = "2018"
+edition = "2021"
 license = "MIT"
 description = "API for tickrs"
 repository = "https://github.com/tarkah/tickrs"
 
-
 [dependencies]
 anyhow = "1.0"
-chrono = { version = "0.4", features = ["serde"] }
-serde_urlencoded = "0.6"
-serde_json = "1.0"
-serde = { version = "1.0", features=["derive"] }
-
 futures = "0.3"
-
-http = "0.1"
-curl = { version = "0.4", default-features=false, features = ["static-ssl"] }
-isahc = "0.8"
+http = "0.2"
+isahc = { version = "1.7", features = ["static-ssl"] }
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+serde_urlencoded = "0.7"
 
 [dev-dependencies]
 async-std = { version = "1", features = ["attributes"] }
diff --git a/api/src/client.rs b/api/src/client.rs
@@ -3,7 +3,7 @@ use std::collections::HashMap;
 use anyhow::{bail, Context, Result};
 use futures::AsyncReadExt;
 use http::Uri;
-use isahc::prelude::*;
+use isahc::HttpClient;
 use serde::de::DeserializeOwned;
 
 use crate::model::{Chart, ChartData, Company, CompanyData, Options, OptionsHeader};
diff --git a/rustfmt.toml b/rustfmt.toml
@@ -1,3 +1,3 @@
-edition = "2018"
+edition = "2021"
 imports_granularity = "Module"
 group_imports = "StdExternalCrate"
diff --git a/src/app.rs b/src/app.rs
@@ -35,7 +35,7 @@ impl App {
         let mut timestamp_updates = self.default_timestamp_service.updates();
 
         if let Some(new_defaults) = timestamp_updates.pop() {
-            *DEFAULT_TIMESTAMPS.write().unwrap() = new_defaults;
+            *DEFAULT_TIMESTAMPS.write() = new_defaults;
         }
     }
 }
diff --git a/src/common.rs b/src/common.rs
@@ -187,7 +187,7 @@ impl TimeFrame {
     }
 
     pub fn format_time(&self, timestamp: i64) -> String {
-        let utc_date = Utc.timestamp(timestamp, 0);
+        let utc_date = Utc.timestamp_opt(timestamp, 0).unwrap();
         let local_date = utc_date.with_timezone(&Local);
 
         let fmt = match self {
diff --git a/src/draw.rs b/src/draw.rs
@@ -245,7 +245,7 @@ fn draw_summary<B: Backend>(frame: &mut Frame<B>, app: &mut App, mut area: Rect)
     area = add_padding(area, 1, PaddingDirection::All);
     area = add_padding(area, 1, PaddingDirection::Right);
 
-    let show_volumes = *SHOW_VOLUMES.read().unwrap() && app.chart_type != ChartType::Kagi;
+    let show_volumes = *SHOW_VOLUMES.read() && app.chart_type != ChartType::Kagi;
     let stock_widget_height = if show_volumes { 7 } else { 6 };
 
     let height = area.height;
diff --git a/src/event.rs b/src/event.rs
@@ -326,12 +326,12 @@ pub fn handle_key_bindings(
         }
         (_, KeyModifiers::NONE, KeyCode::Char('v')) => {
             if app.chart_type != ChartType::Kagi {
-                let mut show_volumes = SHOW_VOLUMES.write().unwrap();
+                let mut show_volumes = SHOW_VOLUMES.write();
                 *show_volumes = !*show_volumes;
             }
         }
         (_, KeyModifiers::NONE, KeyCode::Char('p')) => {
-            let mut guard = ENABLE_PRE_POST.write().unwrap();
+            let mut guard = ENABLE_PRE_POST.write();
             *guard = !*guard;
         }
         (Mode::DisplaySummary, modifiers, keycode) => {
@@ -340,7 +340,7 @@ pub fn handle_key_bindings(
             }
         }
         (_, KeyModifiers::NONE, KeyCode::Char('x')) => {
-            let mut show_x_labels = SHOW_X_LABELS.write().unwrap();
+            let mut show_x_labels = SHOW_X_LABELS.write();
             *show_x_labels = !*show_x_labels;
         }
         (_, KeyModifiers::SHIFT, KeyCode::Left) | (_, KeyModifiers::NONE, KeyCode::Char('<')) => {
diff --git a/src/main.rs b/src/main.rs
@@ -1,15 +1,15 @@
-extern crate tickrs_api as api;
-
 use std::collections::HashMap;
-use std::sync::{Arc, Mutex, RwLock};
 use std::time::Duration;
 use std::{io, panic, thread};
 
 use crossbeam_channel::{bounded, select, unbounded, Receiver, Sender};
 use crossterm::event::{Event, MouseEvent, MouseEventKind};
 use crossterm::{cursor, execute, terminal};
 use lazy_static::lazy_static;
+use parking_lot::{Mutex, RwLock};
+use rclite::Arc;
 use service::default_timestamps::DefaultTimestampService;
+use tickrs_api as api;
 use tui::backend::CrosstermBackend;
 use tui::Terminal;
 
@@ -114,13 +114,13 @@ fn main() {
         loop {
             select! {
                 recv(redraw_requested) -> _ => {
-                    let mut app = app.lock().unwrap();
+                    let mut app = app.lock();
 
                     draw::draw(&mut terminal, &mut app);
                 }
                 // Default redraw on every duration
                 default(Duration::from_millis(500)) => {
-                    let mut app = app.lock().unwrap();
+                    let mut app = app.lock();
 
                     // Drive animation of loading icon
                     for stock in app.stocks.iter_mut() {
@@ -138,7 +138,7 @@ fn main() {
             // Notified that new data has been fetched from API, update widgets
             // so they can update their state with this new information
             recv(data_received) -> _ => {
-                let mut app = app.lock().unwrap();
+                let mut app = app.lock();
 
                 app.update();
 
@@ -151,11 +151,11 @@ fn main() {
                 }
             }
             recv(ui_events) -> message => {
-                let mut app = app.lock().unwrap();
+                let mut app = app.lock();
 
                 if app.debug.enabled {
-                    if let Ok(event) = message {
-                        app.debug.last_event = Some(event);
+                    if let Ok(ref event) = message {
+                        app.debug.last_event = Some(event.clone());
                     }
                 }
 
diff --git a/src/widget/chart_configuration.rs b/src/widget/chart_configuration.rs
@@ -18,7 +18,7 @@ use crate::THEME;
 #[derive(Default, Debug, Clone)]
 pub struct ChartConfigurationState {
     pub input: Input,
-    pub selection: Option<Selection>,
+    pub selection: Option<KagiSelection>,
     pub error_message: Option<String>,
     pub kagi_options: KagiOptions,
     pub cache_state: CacheState,
@@ -27,7 +27,7 @@ pub struct ChartConfigurationState {
 impl ChartConfigurationState {
     pub fn add_char(&mut self, c: char) {
         let input_field = match self.selection {
-            Some(Selection::KagiReversalValue) => &mut self.input.kagi_reversal_value,
+            Some(KagiSelection::ReversalValue) => &mut self.input.kagi_reversal_value,
             _ => return,
         };
 
@@ -41,7 +41,7 @@ impl ChartConfigurationState {
 
     pub fn del_char(&mut self) {
         let input_field = match self.selection {
-            Some(Selection::KagiReversalValue) => &mut self.input.kagi_reversal_value,
+            Some(KagiSelection::ReversalValue) => &mut self.input.kagi_reversal_value,
             _ => return,
         };
 
@@ -50,14 +50,14 @@ impl ChartConfigurationState {
 
     fn get_tab_artifacts(&mut self) -> Option<(&mut usize, usize)> {
         let tab_field = match self.selection {
-            Some(Selection::KagiReversalType) => &mut self.input.kagi_reversal_type,
-            Some(Selection::KagiPriceType) => &mut self.input.kagi_price_type,
+            Some(KagiSelection::ReversalType) => &mut self.input.kagi_reversal_type,
+            Some(KagiSelection::PriceType) => &mut self.input.kagi_price_type,
             _ => return None,
         };
 
         let mod_value = match self.selection {
-            Some(Selection::KagiReversalType) => 2,
-            Some(Selection::KagiPriceType) => 2,
+            Some(KagiSelection::ReversalType) => 2,
+            Some(KagiSelection::PriceType) => 2,
             _ => 1,
         };
         Some((tab_field, mod_value))
@@ -155,21 +155,21 @@ impl ChartConfigurationState {
 
     pub fn selection_up(&mut self) {
         let new_selection = match self.selection {
-            None => Selection::KagiReversalValue,
-            Some(Selection::KagiReversalValue) => Selection::KagiReversalType,
-            Some(Selection::KagiReversalType) => Selection::KagiPriceType,
-            Some(Selection::KagiPriceType) => Selection::KagiReversalValue,
+            None => KagiSelection::ReversalValue,
+            Some(KagiSelection::ReversalValue) => KagiSelection::ReversalType,
+            Some(KagiSelection::ReversalType) => KagiSelection::PriceType,
+            Some(KagiSelection::PriceType) => KagiSelection::ReversalValue,
         };
 
         self.selection = Some(new_selection);
     }
 
     pub fn selection_down(&mut self) {
         let new_selection = match self.selection {
-            None => Selection::KagiPriceType,
-            Some(Selection::KagiPriceType) => Selection::KagiReversalType,
-            Some(Selection::KagiReversalType) => Selection::KagiReversalValue,
-            Some(Selection::KagiReversalValue) => Selection::KagiPriceType,
+            None => KagiSelection::PriceType,
+            Some(KagiSelection::PriceType) => KagiSelection::ReversalType,
+            Some(KagiSelection::ReversalType) => KagiSelection::ReversalValue,
+            Some(KagiSelection::ReversalValue) => KagiSelection::PriceType,
         };
 
         self.selection = Some(new_selection);
@@ -213,7 +213,7 @@ impl ChartConfigurationState {
             })
             .unwrap_or(0);
 
-        self.selection = Some(Selection::KagiPriceType);
+        self.selection = Some(KagiSelection::PriceType);
         self.input.kagi_reversal_value = format!("{:.2}", reversal_amount);
         self.input.kagi_reversal_type = reversal_type;
         self.input.kagi_price_type = price_type;
@@ -252,10 +252,10 @@ pub enum KagiReversalOption {
 }
 
 #[derive(Debug, Clone, Copy, Hash, PartialEq, Eq)]
-pub enum Selection {
-    KagiPriceType,
-    KagiReversalType,
-    KagiReversalValue,
+pub enum KagiSelection {
+    PriceType,
+    ReversalType,
+    ReversalValue,
 }
 
 pub struct ChartConfigurationWidget {
@@ -358,7 +358,7 @@ fn render_kagi_options(mut area: Rect, buf: &mut Buffer, state: &mut ChartConfig
         Spans::default(),
         Spans::from(vec![
             Span::styled(
-                if state.selection == Some(Selection::KagiPriceType) {
+                if state.selection == Some(KagiSelection::PriceType) {
                     "> "
                 } else {
                     "  "
@@ -370,7 +370,7 @@ fn render_kagi_options(mut area: Rect, buf: &mut Buffer, state: &mut ChartConfig
         Spans::default(),
         Spans::from(vec![
             Span::styled(
-                if state.selection == Some(Selection::KagiReversalType) {
+                if state.selection == Some(KagiSelection::ReversalType) {
                     "> "
                 } else {
                     "  "
@@ -382,7 +382,7 @@ fn render_kagi_options(mut area: Rect, buf: &mut Buffer, state: &mut ChartConfig
         Spans::default(),
         Spans::from(vec![
             Span::styled(
-                if state.selection == Some(Selection::KagiReversalValue) {
+                if state.selection == Some(KagiSelection::ReversalValue) {
                     "> "
                 } else {
                     "  "
@@ -400,7 +400,7 @@ fn render_kagi_options(mut area: Rect, buf: &mut Buffer, state: &mut ChartConfig
                 "Close",
                 style().fg(THEME.text_normal()).bg(
                     match (state.selection, state.input.kagi_price_type) {
-                        (Some(Selection::KagiPriceType), 0) => THEME.highlight_focused(),
+                        (Some(KagiSelection::PriceType), 0) => THEME.highlight_focused(),
                         (_, 0) => THEME.highlight_unfocused(),
                         (_, _) => THEME.background(),
                     },
@@ -411,7 +411,7 @@ fn render_kagi_options(mut area: Rect, buf: &mut Buffer, state: &mut ChartConfig
                 "High / Low",
                 style().fg(THEME.text_normal()).bg(
                     match (state.selection, state.input.kagi_price_type) {
-                        (Some(Selection::KagiPriceType), 1) => THEME.highlight_focused(),
+                        (Some(KagiSelection::PriceType), 1) => THEME.highlight_focused(),
                         (_, 1) => THEME.highlight_unfocused(),
                         (_, _) => THEME.background(),
                     },
@@ -424,7 +424,7 @@ fn render_kagi_options(mut area: Rect, buf: &mut Buffer, state: &mut ChartConfig
                 "Pct",
                 style().fg(THEME.text_normal()).bg(
                     match (state.selection, state.input.kagi_reversal_type) {
-                        (Some(Selection::KagiReversalType), 0) => THEME.highlight_focused(),
+                        (Some(KagiSelection::ReversalType), 0) => THEME.highlight_focused(),
                         (_, 0) => THEME.highlight_unfocused(),
                         (_, _) => THEME.background(),
                     },
@@ -435,7 +435,7 @@ fn render_kagi_options(mut area: Rect, buf: &mut Buffer, state: &mut ChartConfig
                 "Amount",
                 style().fg(THEME.text_normal()).bg(
                     match (state.selection, state.input.kagi_reversal_type) {
-                        (Some(Selection::KagiReversalType), 1) => THEME.highlight_focused(),
+                        (Some(KagiSelection::ReversalType), 1) => THEME.highlight_focused(),
                         (_, 1) => THEME.highlight_unfocused(),
                         (_, _) => THEME.background(),
                     },
@@ -446,12 +446,12 @@ fn render_kagi_options(mut area: Rect, buf: &mut Buffer, state: &mut ChartConfig
         Spans::from(vec![Span::styled(
             format!("{: <22}", &state.input.kagi_reversal_value),
             style()
-                .fg(if state.selection == Some(Selection::KagiReversalValue) {
+                .fg(if state.selection == Some(KagiSelection::ReversalValue) {
                     THEME.text_secondary()
                 } else {
                     THEME.text_normal()
                 })
-                .bg(if state.selection == Some(Selection::KagiReversalValue) {
+                .bg(if state.selection == Some(KagiSelection::ReversalValue) {
                     THEME.highlight_unfocused()
                 } else {
                     THEME.background()
@@ -468,7 +468,7 @@ fn render_kagi_options(mut area: Rect, buf: &mut Buffer, state: &mut ChartConfig
         .render(layout[2], buf);
 
     // Set "cursor" color
-    if matches!(state.selection, Some(Selection::KagiReversalValue)) {
+    if matches!(state.selection, Some(KagiSelection::ReversalValue)) {
         let size = terminal::size().unwrap_or((0, 0));
 
         let x = layout[2].left() as usize + state.input.kagi_reversal_value.len().min(20);
diff --git a/src/widget/options.rs b/src/widget/options.rs
diff --git a/src/widget/stock.rs b/src/widget/stock.rs
diff --git a/src/widget/stock_summary.rs b/src/widget/stock_summary.rs

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ impl App {`
`35`	`35`	`let mut timestamp_updates = self.default_timestamp_service.updates();`
`36`	`36`
`37`	`37`	`if let Some(new_defaults) = timestamp_updates.pop() {`
`38`		`- *DEFAULT_TIMESTAMPS.write().unwrap() = new_defaults;`
	`38`	`+ *DEFAULT_TIMESTAMPS.write() = new_defaults;`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -187,7 +187,7 @@ impl TimeFrame {`
`187`	`187`	`}`
`188`	`188`
`189`	`189`	`pub fn format_time(&self, timestamp: i64) -> String {`
`190`		`- let utc_date = Utc.timestamp(timestamp, 0);`
	`190`	`+ let utc_date = Utc.timestamp_opt(timestamp, 0).unwrap();`
`191`	`191`	`let local_date = utc_date.with_timezone(&Local);`
`192`	`192`
`193`	`193`	`let fmt = match self {`
Original file line number	Diff line number	Diff line change
`@@ -326,12 +326,12 @@ pub fn handle_key_bindings(`
`326`	`326`	`}`
`327`	`327`	`(_, KeyModifiers::NONE, KeyCode::Char('v')) => {`
`328`	`328`	`if app.chart_type != ChartType::Kagi {`
`329`		`- let mut show_volumes = SHOW_VOLUMES.write().unwrap();`
	`329`	`+ let mut show_volumes = SHOW_VOLUMES.write();`
`330`	`330`	`show_volumes = !show_volumes;`
`331`	`331`	`}`
`332`	`332`	`}`
`333`	`333`	`(_, KeyModifiers::NONE, KeyCode::Char('p')) => {`
`334`		`- let mut guard = ENABLE_PRE_POST.write().unwrap();`
	`334`	`+ let mut guard = ENABLE_PRE_POST.write();`
`335`	`335`	`guard = !guard;`
`336`	`336`	`}`
`337`	`337`	`(Mode::DisplaySummary, modifiers, keycode) => {`
`@@ -340,7 +340,7 @@ pub fn handle_key_bindings(`
`340`	`340`	`}`
`341`	`341`	`}`
`342`	`342`	`(_, KeyModifiers::NONE, KeyCode::Char('x')) => {`
`343`		`- let mut show_x_labels = SHOW_X_LABELS.write().unwrap();`
	`343`	`+ let mut show_x_labels = SHOW_X_LABELS.write();`
`344`	`344`	`show_x_labels = !show_x_labels;`
`345`	`345`	`}`
`346`	`346`	`(_, KeyModifiers::SHIFT, KeyCode::Left) \| (_, KeyModifiers::NONE, KeyCode::Char('<')) => {`