Add lint

Author: lsbardel

.github/workflows/build.yml

@@ -16,6 +16,8 @@ jobs:
         uses: actions/checkout@v4
       - name: Set up Rust
         uses: dtolnay/rust-toolchain@stable
+      - name: run linters
+        run: make lint-check
       - name: Build rops binary
         run: cargo build --release
       - name: Upload artifact (binary)

Cargo.lock

@@ -0,0 +1,17 @@
+.PHONY: help
+help:
+	@echo ======================================================================================
+	@echo rOps
+	@echo ======================================================================================
+	@fgrep -h "##" $(MAKEFILE_LIST) | fgrep -v fgrep | sed -e 's/\\$$//' | sed -e 's/##//'
+	@echo ======================================================================================
+
+
+.PHONY: lint
+lint:				## Run linters and fix issues
+	@./dev/lint-rs fix
+
+
+.PHONY: lint
+lint-check:			## Run linters
+	@./dev/lint-rs

Makefile

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+FMT_ARG="--check"
+CLIPPY_ARG="-- -Dwarnings"
+
+if [ "$1" = "fix" ] ; then
+    FMT_ARG=""
+fi
+
+
+cargo fmt ${FMT_ARG}
+cargo clippy ${CLIPPY_ARG}

dev/lint-rs

@@ -146,17 +146,9 @@ impl DockerCommand {
                 let manifest_tag = self.get_push_tag(name, false, settings);
                 let amd64_tag = format!("{}-amd64", manifest_tag);
                 let arm64_tag = format!("{}-arm64", manifest_tag);
-                self.push_manifest(
-                    &manifest_tag,
-                    &amd64_tag,
-                    &arm64_tag,
-                )?;
+                self.push_manifest(&manifest_tag, &amd64_tag, &arm64_tag)?;
                 if let Some(latest_tag) = self.get_latest_tag(name, settings) {
-                    self.push_manifest(
-                        &latest_tag,
-                        &amd64_tag,
-                        &arm64_tag,
-                    )?;
+                    self.push_manifest(&latest_tag, &amd64_tag, &arm64_tag)?;
                 }
                 Ok(())
             }

src/docker.rs

@@ -85,12 +85,12 @@ impl GitSettings {
             .arg("--short")
             .output();
 
-        if let Ok(output) = output {
-            if output.status.success() {
-                let branch = String::from_utf8_lossy(&output.stdout).trim().to_string();
-                if !branch.is_empty() {
-                    return branch;
-                }
+        if let Ok(output) = output
+            && output.status.success()
+        {
+            let branch = String::from_utf8_lossy(&output.stdout).trim().to_string();
+            if !branch.is_empty() {
+                return branch;
             }
         }
 
@@ -102,17 +102,17 @@ impl GitSettings {
             .arg("HEAD")
             .output();
 
-        if let Ok(output) = output {
-            if output.status.success() {
-                let branch_output = String::from_utf8_lossy(&output.stdout);
-                if let Some(branch_line) = branch_output.lines().nth(1) {
-                    let branch = branch_line
-                        .split_whitespace()
-                        .next()
-                        .unwrap_or("")
-                        .to_string();
-                    return branch.trim_start_matches("remotes/origin/").to_string();
-                }
+        if let Ok(output) = output
+            && output.status.success()
+        {
+            let branch_output = String::from_utf8_lossy(&output.stdout);
+            if let Some(branch_line) = branch_output.lines().nth(1) {
+                let branch = branch_line
+                    .split_whitespace()
+                    .next()
+                    .unwrap_or("")
+                    .to_string();
+                return branch.trim_start_matches("remotes/origin/").to_string();
             }
         }
 
@@ -201,29 +201,30 @@ impl GithubDownloadRelease {
         for arch in [
             Some(&settings.system.arch),
             settings.system.arch_variant.as_ref(),
-        ] {
-            if let Some(arch) = arch {
-                let file_name = self.get_file_name(settings, &release, arch);
-                file_names.push(file_name.clone());
-                if let Some(download_url) = &self.download_url {
+        ]
+        .into_iter()
+        .flatten()
+        {
+            let file_name = self.get_file_name(settings, &release, arch);
+            file_names.push(file_name.clone());
+            if let Some(download_url) = &self.download_url {
+                return Ok(Asset {
+                    url: format!("{download_url}/{file_name}"),
+                    name: file_name,
+                    version: release.tag_name.clone(),
+                });
+            } else {
+                // Find the asset matching the current architecture
+                if let Some(asset) = release
+                    .assets
+                    .iter()
+                    .find(|a| a.name.to_lowercase() == file_name)
+                {
                     return Ok(Asset {
-                        url: format!("{download_url}/{file_name}"),
-                        name: file_name,
+                        url: asset.url.clone(),
+                        name: asset.name.clone(),
                         version: release.tag_name.clone(),
                     });
-                } else {
-                    // Find the asset matching the current architecture
-                    if let Some(asset) = release
-                        .assets
-                        .iter()
-                        .find(|a| a.name.to_lowercase() == file_name)
-                    {
-                        return Ok(Asset {
-                            url: asset.url.clone(),
-                            name: asset.name.clone(),
-                            version: release.tag_name.clone(),
-                        });
-                    }
                 }
             }
         }
@@ -243,7 +244,12 @@ impl GithubDownloadRelease {
     pub fn download(&self, settings: &Settings) -> RopsResult<Asset> {
         let asset = self.get_asset(settings)?;
 
-        log::info!("Download version {} - {} from {}", asset.version, asset.name, asset.url);
+        log::info!(
+            "Download version {} - {} from {}",
+            asset.version,
+            asset.name,
+            asset.url
+        );
 
         // Download the binary using the asset's API URL
         let mut response = self

src/git.rs

@@ -1,5 +1,5 @@
 use serde::{Deserialize, Serialize};
-use std::{process::Command};
+use std::process::Command;
 
 #[derive(Debug, Clone, Deserialize, Serialize)]
 pub struct CurrentSystem {

src/system.rs

@@ -115,11 +115,11 @@ impl StreamCommand {
         let stderr_thread = std::thread::spawn(move || {
             let mut error_lines = 0;
             for line in stderr.lines().map_while(Result::ok) {
-                if let Some(ref skip_error) = maybe_skip_error {
-                    if line.contains(skip_error) {
-                        log::debug!("skipping error: {}", line);
-                        continue;
-                    }
+                if let Some(ref skip_error) = maybe_skip_error
+                    && line.contains(skip_error)
+                {
+                    log::debug!("skipping error: {}", line);
+                    continue;
                 }
                 log::warn!("{}", line);
                 error_lines += 1;