merge webUI changes, fmt

.gitlab-ci.yml

@@ -16,8 +16,8 @@ default:
 stages:
   - lint
   - build
-  - test
   - version
+  - test
 
 # TEMPLATE
 .cargo-build:
@@ -62,10 +62,28 @@ build-stable:
 build-msrv:
   extends: build-stable
   image: "rust:1.43.0"
+  cache:
+    key: msrv
+    paths:
+      - target
+      - .cargo
 
 build-nightly:
   extends: build-stable
   image: "rustlang/rust:nightly"
+  cache:
+    key: nightly
+    paths:
+      - target
+      - .cargo
+
+# VERSION
+
+fif-version:
+  stage: version
+  needs: ["build-stable"]
+  script:
+    cargo run -- -V
 
 # TEST
 
@@ -77,16 +95,18 @@ test-msrv:
   extends: test-stable
   image: "rust:1.43.0"
   needs: ["build-msrv"]
+  cache:
+    key: msrv
+    paths:
+      - target
+      - .cargo
 
 test-nightly:
   extends: test-stable
   image: "rustlang/rust:nightly"
   needs: ["build-nightly"]
-
+  cache:
-# VERSION
+    key: nightly
-
+    paths:
-fif-version:
+      - target
-  stage: version
+      - .cargo
-  needs: ["build-stable"]
-  script:
-    cargo run -- -V

src/main.rs

@@ -30,10 +30,10 @@ use once_cell::sync::OnceCell;
 use walkdir::{DirEntry, WalkDir};
 
 use crate::findings::Findings;
+use crate::findings::ScanError;
 use crate::formats::{Format, PowerShell, Shell};
 use crate::mime_db::MimeDb;
 use crate::parameters::{OutputFormat, ScanOpts};
-use crate::findings::ScanError;
 use std::collections::BTreeSet;
 
 mod findings;