rustfmt

hacknus · Dec 22, 2024 · 858a4fb · 858a4fb
1 parent 9c03c5c
commit 858a4fb
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 13 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -14,13 +14,25 @@ jobs:
 
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v3
-      - run: sudo apt-get update  && sudo apt-get install -y libclang-dev libgtk-3-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libxkbcommon-dev libssl-dev && sudo apt-get install libudev-dev && cargo install cargo-bundle
-      - name: Check
-        run: cargo check --verbose
-      - name: Format
-        run: cargo fmt --all -- --check --verbose
+      - uses: actions/checkout@v4
+
+      - name: Install libraries
+        run: sudo apt-get update  && sudo apt-get install -y libclang-dev libgtk-3-dev libxcb-render0-dev libxcb-shape0-dev libxcb-xfixes0-dev libxkbcommon-dev libssl-dev && sudo apt-get install libudev-dev && cargo install cargo-bundle
+
+      - name: Update
+        run: cargo update
+
+      - name: Build
+        run: cargo build --all --all-features
+
+      - name: Cargo check
+        run: cargo check --all --all-features
+
+      - name: Rustfmt
+        run: cargo fmt --all -- --check
+
       - name: Clippy
-        run: cargo clippy -- -D warnings --verbose
-      - name: Run tests
-        run: cargo test --verbose
+        run: cargo clippy --all --all-targets --all-features
+
+      - name: Test
+        run: cargo test --all --all-features
diff --git a/src/custom_highlighter.rs b/src/custom_highlighter.rs
@@ -1,7 +1,7 @@
+extern crate regex;
 use eframe::egui::{self, text::LayoutJob, Color32, TextFormat};
 use eframe::egui::{FontFamily, FontId};
 
-extern crate regex;
 use regex::Regex;
 use regex::RegexSet;
 const DEFAULT_FONT_ID: FontId = FontId::new(14.0, FontFamily::Monospace);

diff --git a/src/main.rs b/src/main.rs
@@ -20,12 +20,12 @@ use eframe::{egui, icon_data};
 use preferences::AppInfo;
 
 mod color_picker;
+mod custom_highlighter;
 mod data;
 mod gui;
 mod io;
 mod serial;
 mod toggle;
-mod custom_highlighter;
 
 const APP_INFO: AppInfo = AppInfo {
     name: "Serial Monitor",

diff --git a/src/serial.rs b/src/serial.rs
@@ -20,15 +20,14 @@ pub struct SerialDevices {
     pub color_vals: Vec<Vec<f32>>,
     pub number_of_plots: Vec<usize>,
     pub number_of_highlights: Vec<usize>,
-
 }
 
 impl Default for SerialDevices {
     fn default() -> Self {
         SerialDevices {
             devices: vec![Device::default()],
             labels: vec![vec!["Column 0".to_string()]],
-            highlight_labels:vec![vec!["".to_string()]],
+            highlight_labels: vec![vec!["".to_string()]],
             colors: vec![vec![COLORS[0]]],
             color_vals: vec![vec![0.0]],
             number_of_plots: vec![1],