Merge pull request #238 from eclipse-score/dcalavrezo_clippy_lint

test: switch to rules_lint

Author: vinodreddy-g

.bazelrc

@@ -31,9 +31,9 @@ build --@score_baselibs//score/mw/log/flags:KRemote_Logging=False
 common --extra_toolchains=@gcc_toolchain//:host_gcc_12
 
 # Clippy linting (enabled by default)
-build --aspects=@rules_rust//rust:defs.bzl%rust_clippy_aspect
-build --output_groups=+clippy_checks
-build --@rules_rust//rust/settings:clippy.toml=@score_rust_policies//clippy/strict:clippy.toml
+build --aspects=@score_rust_policies//clippy:linters.bzl%clippy_strict
+build --output_groups=+rules_lint_human
+build:lint --@aspect_rules_lint//lint:fail_on_violation=true
 
 test --test_output=errors
 

.github/workflows/check.yml

@@ -36,14 +36,6 @@ jobs:
           toolchain: 1.90.0
           components: clippy, rustfmt
 
-      - name: Cargo Clippy
-        run: |
-          cargo clippy --all-targets --all-features
-
-      - name: Cargo Fmt
-        run: |
-          cargo fmt --check
-
       - name: Cargo Build
         run: |
           cargo build

.github/workflows/clippy.yml

@@ -25,4 +25,5 @@ jobs:
   bazel-clippy:
     uses: eclipse-score/cicd-workflows/.github/workflows/static-analysis.yml@main
     with:
-      bazel-target: "build //:clippy"
+      bazel-targets: "//src/rust/..."
+      bazel-config: "lint"

BUILD

@@ -11,7 +11,6 @@
 # SPDX-License-Identifier: Apache-2.0
 # *******************************************************************************
 
-load("@rules_rust//rust:defs.bzl", "rust_clippy")
 load("@score_docs_as_code//:docs.bzl", "docs")
 load("@score_tooling//:defs.bzl", "cli_helper", "copyright_checker", "dash_license_checker", "rust_coverage_report", "setup_starpls", "use_format_targets")
 load("//:project_config.bzl", "PROJECT_CONFIG")
@@ -103,17 +102,6 @@ alias(
 # Add target for formatting checks
 use_format_targets()
 
-rust_clippy(
-    name = "clippy",
-    testonly = True,
-    tags = ["manual"],
-    visibility = ["//visibility:public"],
-    deps = [
-        "//src/rust/rust_kvs",
-        "//src/rust/rust_kvs_tool:kvs_tool",
-    ],
-)
-
 alias(
     name = "kvs_cpp",
     actual = "//src/cpp/src:kvs_cpp",

MODULE.bazel

@@ -41,7 +41,7 @@ use_repo(pip, "pip_score_venv_test")
 bazel_dep(name = "rules_rust", version = "0.61.0")
 
 # Shared Rust policies (Clippy config, etc.), overridden locally during development.
-bazel_dep(name = "score_rust_policies", version = "0.0.2", dev_dependency = True)
+bazel_dep(name = "score_rust_policies", version = "0.0.4", dev_dependency = True)
 
 # bazel cc rules
 bazel_dep(name = "rules_cc", version = "0.1.2")
@@ -90,7 +90,7 @@ bazel_dep(name = "score_python_basics", version = "0.3.4")
 bazel_dep(name = "score_tooling", version = "1.1.0")
 
 # ToDo: implicit dependencies for score_tooling, but needed directly here??
-bazel_dep(name = "aspect_rules_lint", version = "1.10.2")
+bazel_dep(name = "aspect_rules_lint", version = "2.0.0")
 bazel_dep(name = "buildifier_prebuilt", version = "8.2.0.2")
 
 ## temporary overrides / tools

README.md

@@ -118,8 +118,9 @@ bazel test <TARGET_NAME>
 
 ## Clippy
 
-- Clippy runs by default via `.bazelrc` on all Rust targets (Rust tests are tagged `no-clippy`).
-- Use `bazel build //:clippy` if you want an explicit lint-only target, or `bazel build //src/rust/...` while building.
+- Clippy runs by default via `.bazelrc` when building Rust targets (rules_lint aspect).
+- Use `bazel build //src/rust/...` (or any Rust target pattern) while developing.
+- Use `bazel build --config=lint //src/rust/...` to enable lint config, including `--@aspect_rules_lint//lint:fail_on_violation=true`.
 - The Clippy config comes from `@score_rust_policies//clippy/strict:clippy.toml`.
 
 ## Cargo-based operations

rustfmt.toml

@@ -0,0 +1,4 @@
+# `rustfmt` should not be used with local configuration.
+# Use Bazel target for formatting.
+# E.g., `bazel run //:format.fix_Rust_with_rustfmt`
+DO_NOT_USE_LOCAL_RUSTFMT_TOML = false

src/rust/rust_kvs/examples/basic.rs

@@ -30,9 +30,7 @@ fn main() -> Result<(), ErrorCode> {
     {
         // Build KVS instance for given instance ID and temporary directory.
         let builder = KvsBuilder::new(instance_id).backend(Box::new(
-            JsonBackendBuilder::new()
-                .working_dir(dir_path.clone())
-                .build(),
+            JsonBackendBuilder::new().working_dir(dir_path.clone()).build(),
         ));
         let kvs = builder.build()?;
 
@@ -43,11 +41,7 @@ fn main() -> Result<(), ErrorCode> {
         kvs.set_value("null", ())?;
         kvs.set_value(
             "array",
-            vec![
-                KvsValue::from(456.0),
-                false.into(),
-                "Second".to_string().into(),
-            ],
+            vec![KvsValue::from(456.0), false.into(), "Second".to_string().into()],
         )?;
         kvs.set_value(
             "object",
@@ -58,11 +52,7 @@ fn main() -> Result<(), ErrorCode> {
                 ("sub-null".into(), ().into()),
                 (
                     "sub-array".into(),
-                    KvsValue::from(vec![
-                        KvsValue::from(1246.0),
-                        false.into(),
-                        "Fourth".to_string().into(),
-                    ]),
+                    KvsValue::from(vec![KvsValue::from(1246.0), false.into(), "Fourth".to_string().into()]),
                 ),
             ]),
         )?;
@@ -75,9 +65,8 @@ fn main() -> Result<(), ErrorCode> {
 
     {
         // Build KVS instance for given instance ID and temporary directory.
-        let builder = KvsBuilder::new(instance_id).backend(Box::new(
-            JsonBackendBuilder::new().working_dir(dir_path).build(),
-        ));
+        let builder =
+            KvsBuilder::new(instance_id).backend(Box::new(JsonBackendBuilder::new().working_dir(dir_path).build()));
         let kvs = builder.build()?;
 
         // `get_value` usage - print all existing keys with their values.

src/rust/rust_kvs/examples/custom_types.rs

@@ -44,12 +44,14 @@ impl KvsDeserialize for Point {
     fn from_kvs(kvs_value: &KvsValue) -> Result<Self, Self::Error> {
         if let KvsValue::Object(map) = kvs_value {
             Ok(Point {
-                x: f64::from_kvs(map.get("x").ok_or(ErrorCode::DeserializationFailed(
-                    "Field not found".to_string(),
-                ))?)?,
-                y: f64::from_kvs(map.get("y").ok_or(ErrorCode::DeserializationFailed(
-                    "Field not found".to_string(),
-                ))?)?,
+                x: f64::from_kvs(
+                    map.get("x")
+                        .ok_or(ErrorCode::DeserializationFailed("Field not found".to_string()))?,
+                )?,
+                y: f64::from_kvs(
+                    map.get("y")
+                        .ok_or(ErrorCode::DeserializationFailed("Field not found".to_string()))?,
+                )?,
             })
         } else {
             Err(ErrorCode::DeserializationFailed(
@@ -145,42 +147,54 @@ impl KvsDeserialize for Example {
     fn from_kvs(kvs_value: &KvsValue) -> Result<Self, Self::Error> {
         if let KvsValue::Object(map) = kvs_value {
             Ok(Example {
-                i32: i32::from_kvs(map.get("i32").ok_or(ErrorCode::DeserializationFailed(
-                    "Field not found".to_string(),
-                ))?)?,
-                u32: u32::from_kvs(map.get("u32").ok_or(ErrorCode::DeserializationFailed(
-                    "Field not found".to_string(),
-                ))?)?,
-                i64: i64::from_kvs(map.get("i64").ok_or(ErrorCode::DeserializationFailed(
-                    "Field not found".to_string(),
-                ))?)?,
-                u64: u64::from_kvs(map.get("u64").ok_or(ErrorCode::DeserializationFailed(
-                    "Field not found".to_string(),
-                ))?)?,
-                f64: f64::from_kvs(map.get("f64").ok_or(ErrorCode::DeserializationFailed(
-                    "Field not found".to_string(),
-                ))?)?,
-                bool: bool::from_kvs(map.get("bool").ok_or(ErrorCode::DeserializationFailed(
-                    "Field not found".to_string(),
-                ))?)?,
-                string: String::from_kvs(map.get("string").ok_or(
-                    ErrorCode::DeserializationFailed("Field not found".to_string()),
-                )?)?,
-                vec: Vec::from_kvs(map.get("vec").ok_or(ErrorCode::DeserializationFailed(
-                    "Field not found".to_string(),
-                ))?)?,
-                object: KvsMap::from_kvs(map.get("object").ok_or(
-                    ErrorCode::DeserializationFailed("Field not found".to_string()),
-                )?)?,
-                u8: u8::from_kvs(map.get("u8").ok_or(ErrorCode::DeserializationFailed(
-                    "Field not found".to_string(),
-                ))?)?,
-                nested: Point::from_kvs(map.get("nested").ok_or(
-                    ErrorCode::DeserializationFailed("Field not found".to_string()),
-                )?)?,
-                ip: IpAddrWrapper::from_kvs(map.get("ip").ok_or(
-                    ErrorCode::DeserializationFailed("Field not found".to_string()),
-                )?)?
+                i32: i32::from_kvs(
+                    map.get("i32")
+                        .ok_or(ErrorCode::DeserializationFailed("Field not found".to_string()))?,
+                )?,
+                u32: u32::from_kvs(
+                    map.get("u32")
+                        .ok_or(ErrorCode::DeserializationFailed("Field not found".to_string()))?,
+                )?,
+                i64: i64::from_kvs(
+                    map.get("i64")
+                        .ok_or(ErrorCode::DeserializationFailed("Field not found".to_string()))?,
+                )?,
+                u64: u64::from_kvs(
+                    map.get("u64")
+                        .ok_or(ErrorCode::DeserializationFailed("Field not found".to_string()))?,
+                )?,
+                f64: f64::from_kvs(
+                    map.get("f64")
+                        .ok_or(ErrorCode::DeserializationFailed("Field not found".to_string()))?,
+                )?,
+                bool: bool::from_kvs(
+                    map.get("bool")
+                        .ok_or(ErrorCode::DeserializationFailed("Field not found".to_string()))?,
+                )?,
+                string: String::from_kvs(
+                    map.get("string")
+                        .ok_or(ErrorCode::DeserializationFailed("Field not found".to_string()))?,
+                )?,
+                vec: Vec::from_kvs(
+                    map.get("vec")
+                        .ok_or(ErrorCode::DeserializationFailed("Field not found".to_string()))?,
+                )?,
+                object: KvsMap::from_kvs(
+                    map.get("object")
+                        .ok_or(ErrorCode::DeserializationFailed("Field not found".to_string()))?,
+                )?,
+                u8: u8::from_kvs(
+                    map.get("u8")
+                        .ok_or(ErrorCode::DeserializationFailed("Field not found".to_string()))?,
+                )?,
+                nested: Point::from_kvs(
+                    map.get("nested")
+                        .ok_or(ErrorCode::DeserializationFailed("Field not found".to_string()))?,
+                )?,
+                ip: IpAddrWrapper::from_kvs(
+                    map.get("ip")
+                        .ok_or(ErrorCode::DeserializationFailed("Field not found".to_string()))?,
+                )?
                 .0,
             })
         } else {
@@ -205,18 +219,11 @@ fn main() -> Result<(), ErrorCode> {
         f64: 444.4,
         bool: true,
         string: "example".to_string(),
-        vec: vec![
-            KvsValue::from("one"),
-            KvsValue::from("two"),
-            KvsValue::from("three"),
-        ],
+        vec: vec![KvsValue::from("one"), KvsValue::from("two"), KvsValue::from("three")],
         object: KvsMap::from([
             ("first".to_string(), KvsValue::from(-123i32)),
             ("second".to_string(), KvsValue::from(321u32)),
-            (
-                "third".to_string(),
-                KvsValue::String("map_example".to_string()),
-            ),
+            ("third".to_string(), KvsValue::String("map_example".to_string())),
         ]),
         u8: 200,
         nested: Point { x: 432.1, y: 654.3 },
@@ -231,9 +238,7 @@ fn main() -> Result<(), ErrorCode> {
     let kvs = KvsBuilder::new(InstanceId(0))
         .kvs_load(KvsLoad::Ignored)
         .defaults(KvsDefaults::Ignored)
-        .backend(Box::new(
-            JsonBackendBuilder::new().working_dir(dir_path).build(),
-        ))
+        .backend(Box::new(JsonBackendBuilder::new().working_dir(dir_path).build()))
         .build()?;
 
     // Serialize and set object.

src/rust/rust_kvs/examples/defaults.rs

@@ -61,9 +61,7 @@ fn main() -> Result<(), ErrorCode> {
     // Build KVS instance for given instance ID and temporary directory.
     // `defaults` is set to `KvsDefaults::Required` - defaults are required.
     let builder = KvsBuilder::new(instance_id)
-        .backend(Box::new(
-            JsonBackendBuilder::new().working_dir(dir_path).build(),
-        ))
+        .backend(Box::new(JsonBackendBuilder::new().working_dir(dir_path).build()))
         .defaults(KvsDefaults::Required);
     let kvs = builder.build()?;