deps: Update dependencies, drop MSRV

Update dependencies to most recent versions if applicable. Refactor to deal with breaking changes. Drop MSRV due to dependency issues, just support stable and later.

Author: ClementTsang

.travis.yml

@@ -1,7 +1,5 @@
 language: rust
 rust:
-  # MSRV; though I only want to test if it builds.
-  - 1.40.0
   - stable
   - beta
 os:
@@ -13,8 +11,6 @@ jobs:
   exclude:
     - if: tag IS present
       rust: beta
-    - if: tag IS present
-      rust: 1.40.0
 branches:
   only:
     - master
@@ -34,15 +30,9 @@ before_script:
   - rustup target add $TARGET
   - rustup component add clippy
 script:
-  - |
-    if [[ $TRAVIS_RUST_VERSION != "1.40.0" ]]; then
-      cargo clippy -- -D clippy::all
-    fi
+  - cargo clippy -- -D clippy::all
   - cargo build --verbose --target $TARGET
-  - |
-    if [[ $TRAVIS_RUST_VERSION != "1.40.0" ]]; then
-      cargo test --verbose --target $TARGET;
-    fi
+  - cargo test --verbose --target $TARGET
   - cargo install --path . --target $TARGET --locked --force
 
 before_cache:

CHANGELOG.md

@@ -13,6 +13,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - [179](https://github.com/ClementTsang/bottom/pull/179): Show full command/process path as an option.
 
+### Changes
+
+- Changed to just support stable (and newer) Rust, due to library incompatibilities.
+
 ## [0.4.5] - 2020-07-08
 
 - No changes here, just an uptick for Crates.io using the wrong Cargo.lock.

CONTRIBUTING.md

@@ -36,7 +36,7 @@ For reports/suggestions that don't fit the definition of a feature or bug, try t
 If you want to help contribute by submitting a PR, by all means, I'm open! In regards to the development process:
 
 - I develop primarily using _stable_ Rust. That is, whatever is the most up-to-date stable version you can get via running
-  `rustup update stable`. However, as of writing, I do support a MSRV of 1.40.0.
+  `rustup update stable`.
 
   - Note that `cargo test` will fail on anything lower than 1.43.0 due to it using a then-introduced env variable.
 

Cargo.lock

@@ -23,22 +23,22 @@ codegen-units = 1
 [dependencies]
 battery = "0.7.5"
 crossterm = "0.17"
-chrono = "0.4.11"
-clap = "2.33.1"
-dirs = "2.0.2"
+chrono = "0.4.13"
+clap = "2.33.2"
+dirs = "3.0.1"
 futures = "0.3.5"
 heim = "0.0.10"
 itertools = "0.9.0"
 regex = "1.3"
-sysinfo = "0.14.2"
+sysinfo = "0.15.0"
 toml = "0.5.6"
-typed-builder = "0.6.0"
+typed-builder = "0.7.0"
 lazy_static = "1.4.0"
 backtrace = "0.3"
 serde = {version = "1.0", features = ["derive"] }
 unicode-segmentation = "1.6.0"
 unicode-width = "0.1.7"
-tui = {version = "0.9", features = ["crossterm"], default-features = false }
+tui = {version = "0.10.0", features = ["crossterm"], default-features = false }
 
 # For debugging only...
 fern = "0.6.0"
@@ -50,6 +50,7 @@ winapi = "0.3.8"
 [dev-dependencies]
 assert_cmd = "1.0"
 predicates = "1"
+cargo-husky = "1"
 
 [package.metadata.deb]
 section = "utils"

Cargo.toml

@@ -13,7 +13,7 @@ A cross-platform graphical process/system monitor with a customizable interface
 ## Table of Contents
 
 - [Installation](#installation)
-  - [Manual](#manual)
+  - [Manually](#manually)
   - [Cargo](#cargo)
   - [AUR](#aur)
   - [Debian (and Debian-based)](#debian)
@@ -59,9 +59,9 @@ Note that bottom is:
 
 As such, support beyond that is not guaranteed.
 
-### Manual
+### [Manually]
 
-There are a few ways to go about doing this. Note that the MSRV is 1.40.0. For example:
+There are a few ways to go about doing this manually. If you do so, please build using the current stable release of Rust. For example:
 
 ```bash
 # If required, update Rust on the stable channel
@@ -84,6 +84,9 @@ cargo install --path .
 ### Cargo
 
 ```bash
+# If required, update Rust on the stable channel
+rustup update stable
+
 cargo install bottom
 
 # OR, --locked may be required due to how cargo install works

README.md

@@ -4,7 +4,7 @@ use std::collections::HashMap;
 use tui::{
     backend::Backend,
     layout::{Constraint, Direction, Layout, Rect},
-    widgets::Text,
+    text::{Span, Spans},
     Frame, Terminal,
 };
 
@@ -55,7 +55,7 @@ pub struct Painter {
     pub colours: CanvasColours,
     height: u16,
     width: u16,
-    styled_help_text: Vec<Text<'static>>,
+    styled_help_text: Vec<Spans<'static>>,
     is_mac_os: bool,
     row_constraints: Vec<Constraint>,
     col_constraints: Vec<Vec<Constraint>>,
@@ -139,14 +139,14 @@ impl Painter {
             colours: CanvasColours::default(),
             height: 0,
             width: 0,
-            styled_help_text: Vec::new(),
+            styled_help_text: Vec::default(),
             is_mac_os: false,
             row_constraints,
             col_constraints,
             col_row_constraints,
             layout_constraints,
             widget_layout,
-            derived_widget_draw_locs: Vec::new(),
+            derived_widget_draw_locs: Vec::default(),
             table_height_offset: 4 + table_gap,
         }
     }
@@ -155,34 +155,35 @@ impl Painter {
     /// This is to set some remaining styles and text.
     pub fn complete_painter_init(&mut self) {
         self.is_mac_os = cfg!(target_os = "macos");
+        let mut styled_help_spans = Vec::new();
 
         // Init help text:
         (*HELP_TEXT).iter().enumerate().for_each(|(itx, section)| {
             if itx == 0 {
-                self.styled_help_text.extend(
+                styled_help_spans.extend(
                     section
                         .iter()
-                        .map(|&text| Text::Styled(text.into(), self.colours.text_style))
+                        .map(|&text| Span::styled(text, self.colours.text_style))
                         .collect::<Vec<_>>(),
                 );
             } else {
                 // Not required check but it runs only a few times... so whatever ig, prevents me from
                 // being dumb and leaving a help text section only one line long.
                 if section.len() > 1 {
-                    self.styled_help_text.push(Text::Raw("\n\n".into()));
-                    self.styled_help_text.push(Text::Styled(
-                        section[0].into(),
-                        self.colours.table_header_style,
-                    ));
-                    self.styled_help_text.extend(
+                    styled_help_spans.push(Span::from("\n\n"));
+                    styled_help_spans
+                        .push(Span::styled(section[0], self.colours.table_header_style));
+                    styled_help_spans.extend(
                         section[1..]
                             .iter()
-                            .map(|&text| Text::Styled(text.into(), self.colours.text_style))
+                            .map(|&text| Span::styled(text, self.colours.text_style))
                             .collect::<Vec<_>>(),
                     );
                 }
             }
         });
+
+        self.styled_help_text = styled_help_spans.into_iter().map(Spans::from).collect();
     }
 
     pub fn draw_data<B: Backend>(

src/canvas.rs

@@ -85,7 +85,7 @@ impl CanvasColours {
     }
 
     pub fn set_table_header_colour(&mut self, colour: &str) -> error::Result<()> {
-        self.table_header_style = get_style_from_config(colour)?.modifier(Modifier::BOLD);
+        self.table_header_style = get_style_from_config(colour)?.add_modifier(Modifier::BOLD);
         Ok(())
     }