From 1f6f9b4a5f637ac47d5ba30e30245960e361f9ea Mon Sep 17 00:00:00 2001 From: Rickard Andersson Date: Sat, 12 Apr 2025 14:49:09 +0200 Subject: [PATCH 1/4] Set explicit rust version (1.86.0) --- .github/workflows/pr.yml | 6 ++++++ .github/workflows/release.yml | 15 ++++++++++++--- Cargo.toml | 3 ++- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index dd88f31..b8b5d34 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -4,11 +4,17 @@ on: pull_request: branches: [main] +env: + RUST_VERSION: 1.86.0 + jobs: validate: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 + - uses: dtolnay/rust-toolchain@master + with: + toolchain: ${{ env.RUST_VERSION }} - name: build run: cargo build --verbose - name: test diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7b60ebd..b052f89 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -5,12 +5,17 @@ on: tags: - v* +env: + RUST_VERSION: 1.86.0 + jobs: publish: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@stable + - uses: dtolnay/rust-toolchain@master + with: + toolchain: ${{ env.RUST_VERSION }} - name: Publish to crates.io run: | cargo publish \ @@ -41,7 +46,9 @@ jobs: TARGET: ${{ matrix.target }} steps: - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@stable + - uses: dtolnay/rust-toolchain@master + with: + toolchain: ${{ env.RUST_VERSION }} - name: add target run: rustup target add $TARGET - name: build @@ -62,7 +69,9 @@ jobs: TARGET: x86_64-pc-windows-msvc steps: - uses: actions/checkout@v4 - - uses: dtolnay/rust-toolchain@stable + - uses: dtolnay/rust-toolchain@master + with: + toolchain: ${{ env.RUST_VERSION }} - name: add target run: rustup target add $env:TARGET - name: build diff --git a/Cargo.toml b/Cargo.toml index 242e7c1..e09b955 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,7 +8,8 @@ readme = "README.md" keywords = ["soup", "iec62304", "compliance", "traceability"] license = "MIT" -edition = "2021" +edition = "2024" +rust-version = "1.86.0" [dependencies] clap = { version = "4.5.36", features = ["derive"] } From 53e2122fd1eb66b006a544671d3b1999be41602c Mon Sep 17 00:00:00 2001 From: Rickard Andersson Date: Sat, 12 Apr 2025 14:50:37 +0200 Subject: [PATCH 2/4] fmt --- src/main.rs | 2 +- src/parse/csproj.rs | 2 +- src/parse/package_json.rs | 2 +- src/scan/dir_scan.rs | 8 ++++---- src/soup/contexts_io.rs | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main.rs b/src/main.rs index b93ed28..e196daf 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1,5 +1,5 @@ use clap::Parser; -use serde_json::{json, Map, Value}; +use serde_json::{Map, Value, json}; use std::{env, path, process}; mod parse; diff --git a/src/parse/csproj.rs b/src/parse/csproj.rs index 945f03d..8775df5 100644 --- a/src/parse/csproj.rs +++ b/src/parse/csproj.rs @@ -1,7 +1,7 @@ use super::SoupParse; use crate::soup::model::{Soup, SoupSourceParseError}; -use quick_xml::events::Event; use quick_xml::Reader; +use quick_xml::events::Event; use serde_json::{Map, Value}; use std::collections::{BTreeSet, HashMap}; diff --git a/src/parse/package_json.rs b/src/parse/package_json.rs index 4594311..30cd239 100644 --- a/src/parse/package_json.rs +++ b/src/parse/package_json.rs @@ -22,7 +22,7 @@ impl SoupParse for PackageJson { Err(e) => { return Err(SoupSourceParseError { message: format!("Invalid package.json structure ({})", e), - }) + }); } }; diff --git a/src/scan/dir_scan.rs b/src/scan/dir_scan.rs index 8fd4c65..6d4d9af 100644 --- a/src/scan/dir_scan.rs +++ b/src/scan/dir_scan.rs @@ -1,7 +1,7 @@ use crate::{ parse::{ - apt::Apt, cargo::Cargo, csproj::CsProj, docker_base::DockerBase, package_json::PackageJson, - SoupParse, + SoupParse, apt::Apt, cargo::Cargo, csproj::CsProj, docker_base::DockerBase, + package_json::PackageJson, }, soup::model::{Soup, SoupContexts, SouperIoError}, utils, @@ -39,7 +39,7 @@ pub fn scan( Err(e) => { return Err(SouperIoError { message: format!("Not able to read file: {} ({})", path.display(), e), - }) + }); } }; let parse_results: Result, _> = parsers @@ -125,7 +125,7 @@ fn relative_path>(full_path: P, root_path: P) -> Result { return Err(SouperIoError { message: "Not able to convert relative path to string".to_string(), - }) + }); } }; let relative_path = relative_path.replace('\\', "/"); diff --git a/src/soup/contexts_io.rs b/src/soup/contexts_io.rs index 6eb212e..133509e 100644 --- a/src/soup/contexts_io.rs +++ b/src/soup/contexts_io.rs @@ -60,7 +60,7 @@ impl SoupContexts { Err(e) => { return Err(SouperIoError { message: format!("Not able to serialize to json: {}", e), - }) + }); } }; match writer.write_all(json.as_bytes()) { From ffcf6c5e4dbb2bf077f40fad73ffef3184e5f90c Mon Sep 17 00:00:00 2001 From: Rickard Andersson Date: Sat, 12 Apr 2025 14:53:16 +0200 Subject: [PATCH 3/4] Add rustup components --- .github/workflows/pr.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index b8b5d34..2ce965d 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -15,6 +15,7 @@ jobs: - uses: dtolnay/rust-toolchain@master with: toolchain: ${{ env.RUST_VERSION }} + components: clippy, rustfmt - name: build run: cargo build --verbose - name: test From 53dae0545cd15e8afd04005ee9892ce60699237d Mon Sep 17 00:00:00 2001 From: Rickard Andersson Date: Sat, 12 Apr 2025 14:54:36 +0200 Subject: [PATCH 4/4] empty commit