chore: merge release-v0.1.10 into main

mrjackwills · Dec 25, 2022 · 2eaf209 · 2eaf209
2 parents af3bbe8 + 46d4e5a
commit 2eaf209
Show file tree

Hide file tree

Showing 13 changed files with 111 additions and 92 deletions.
diff --git a/.github/release-body.md b/.github/release-body.md
@@ -1,8 +1,17 @@
-### 2022-12-05
+### 2022-12-25
+
+### Chores
++ dependencies updated, [1525b3150293015c0fb2f2161da463b21ac2694c], [8d539ab14809136d743c49d60779687fc8eeef6d], [1774217a8a657d261397d213e5ecee667cf3b6b1]
++ Rust 1.66 linting, [bf9dcac7045c0d2314df147ec2744a3ad886564b]
+
+### Features
++ Caching on github action, [a91c9aa45ffd5c998cd1b83d8e90d0912893c31f]
 
 ### Fixes
-+ disallow commands to be sent to a dockerised oxker container, closes #19, [160b8021b1de898064756b53c127d49b8096ce4d]
-+ if no container created time, use 0, instead of system_time(), [1adb61ce3b029d4fcf51961958d483b2fae8825a]
++ comment typo, [7899b773569fed86343a035d3023bf34297fdabb]
+
+### Refactors
++ remove_ansi() to single liner, [57c3a6c186b916faba24bf7b5cdbbda31d636a7e]
 
 
 see <a href='https://github.com/mrjackwills/oxker/blob/main/CHANGELOG.md'>CHANGELOG.md</a> for more details
diff --git a/.github/workflows/create_release_and_build.yml b/.github/workflows/create_release_and_build.yml
@@ -27,6 +27,10 @@ jobs:
       - name: install rust
         uses: dtolnay/rust-toolchain@stable
 
+      # Setup caching - not sure if will have any effect
+      - name: Rust cache
+        uses: swatinem/rust-cache@v2
+
       # Install cross-rs
       - name: install cross
         run: cargo install cross --git https://github.com/cross-rs/cross

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,19 @@
+# <a href='https://github.com/mrjackwills/oxker/releases/tag/v0.1.10'>v0.1.10</a>
+### 2022-12-25
+
+### Chores
++ dependencies updated, [1525b315](https://github.com/mrjackwills/oxker/commit/1525b3150293015c0fb2f2161da463b21ac2694c), [8d539ab1](https://github.com/mrjackwills/oxker/commit/8d539ab14809136d743c49d60779687fc8eeef6d), [1774217a](https://github.com/mrjackwills/oxker/commit/1774217a8a657d261397d213e5ecee667cf3b6b1)
++ Rust 1.66 linting, [bf9dcac7](https://github.com/mrjackwills/oxker/commit/bf9dcac7045c0d2314df147ec2744a3ad886564b)
+
+### Features
++ Caching on github action, [a91c9aa4](https://github.com/mrjackwills/oxker/commit/a91c9aa45ffd5c998cd1b83d8e90d0912893c31f)
+
+### Fixes
++ comment typo, [7899b773](https://github.com/mrjackwills/oxker/commit/7899b773569fed86343a035d3023bf34297fdabb)
+
+### Refactors
++ remove_ansi() to single liner, [57c3a6c1](https://github.com/mrjackwills/oxker/commit/57c3a6c186b916faba24bf7b5cdbbda31d636a7e)
+
 # <a href='https://github.com/mrjackwills/oxker/releases/tag/v0.1.9'>v0.1.9</a>
 ### 2022-12-05
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "oxker"
-version = "0.1.9"
+version = "0.1.10"
 edition = "2021"
 authors = ["Jack Wills <email@mrjackwills.com>"]
 description = "A simple tui to view & control docker containers"
@@ -19,7 +19,7 @@ clap={version="4.0", features = ["derive", "unicode", "color"] }
 crossterm = "0.25"
 futures-util = "0.3"
 parking_lot = {version= "0.12"}
-tokio = {version = "1.22", features=["full"]}
+tokio = {version = "1.23", features=["full"]}
 tracing = "0.1"
 tracing-subscriber = "0.3"
 tui = "0.19"

diff --git a/src/app_data/container_state.rs b/src/app_data/container_state.rs
@@ -111,7 +111,7 @@ impl<T> StatefulList<T> {
                 .state
                 .selected()
                 .map_or(0, |value| if len > 0 { value + 1 } else { value });
-            format!("{}/{}", c, self.items.len())
+            format!("{c}/{}", self.items.len())
         }
     }
 }
@@ -191,7 +191,7 @@ impl fmt::Display for State {
             Self::Running => "✓ running",
             Self::Unknown => "? unknown",
         };
-        write!(f, "{}", disp)
+        write!(f, "{disp}")
     }
 }
 
@@ -237,7 +237,7 @@ impl fmt::Display for DockerControls {
             Self::Stop => "stop",
             Self::Unpause => "unpause",
         };
-        write!(f, "{}", disp)
+        write!(f, "{disp}")
     }
 }
 
@@ -292,7 +292,7 @@ impl Stats for CpuStats {
 impl fmt::Display for CpuStats {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         let disp = format!("{:05.2}%", self.0);
-        write!(f, "{:>x$}", disp, x = f.width().unwrap_or(1))
+        write!(f, "{disp:>x$}", x = f.width().unwrap_or(1))
     }
 }
 
@@ -346,7 +346,7 @@ impl fmt::Display for ByteStats {
             x if x >= ONE_KB => format!("{y:.2} kB", y = as_f64 / ONE_KB),
             _ => format!("{} B", self.0),
         };
-        write!(f, "{:>x$}", p, x = f.width().unwrap_or(1))
+        write!(f, "{p:>x$}", x = f.width().unwrap_or(1))
     }
 }
 
@@ -429,7 +429,7 @@ impl ContainerItem {
         self.cpu_stats
             .iter()
             .enumerate()
-            .map(|i| (i.0 as f64, i.1 .0 as f64))
+            .map(|i| (i.0 as f64, i.1 .0))
             .collect::<Vec<_>>()
     }