From c7383ef23d5055cf8ad5be3568b06e869f5284d2 Mon Sep 17 00:00:00 2001
From: Jianfeng Jiang <jiangjianfeng.jjf@antgroup.com>
Date: Wed, 13 Mar 2024 06:40:21 +0000
Subject: [PATCH] Check OSDK crate when running `make check`

---
 Makefile                  | 1 +
 osdk/src/commands/test.rs | 2 +-
 osdk/src/util.rs          | 4 ++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 25a16df7..c67a02a7 100644
--- a/Makefile
+++ b/Makefile
@@ -163,6 +163,7 @@ format:
 
 .PHONY: check
 check: $(CARGO_OSDK)
+	@cd osdk && cargo clippy -- -D warnings
 	@./tools/format_all.sh --check   	# Check Rust format issues
 	@# Check if STD_CRATES and NOSTD_CRATES combined is the same as all workspace members
 	@sed -n '/^\[workspace\]/,/^\[.*\]/{/members = \[/,/\]/p}' Cargo.toml | \
diff --git a/osdk/src/commands/test.rs b/osdk/src/commands/test.rs
index ea531b4c..3cc1ee69 100644
--- a/osdk/src/commands/test.rs
+++ b/osdk/src/commands/test.rs
@@ -90,7 +90,7 @@ fn get_workspace_default_members() -> Vec<String> {
         .map(|value| {
             // The default member is in the form of "<crate_name> <crate_version> (path+file://<crate_path>)"
             let default_member = value.as_str().unwrap();
-            let path = default_member.split(" ").nth(2).unwrap();
+            let path = default_member.split(' ').nth(2).unwrap();
             path.trim_start_matches("(path+file://")
                 .trim_end_matches(')')
                 .to_string()
diff --git a/osdk/src/util.rs b/osdk/src/util.rs
index 440b837a..04a32e37 100644
--- a/osdk/src/util.rs
+++ b/osdk/src/util.rs
@@ -106,7 +106,7 @@ fn get_default_member(metadata: &serde_json::Value) -> &str {
             .iter()
             .filter(|package| {
                 let id = package.get("id").unwrap();
-                if !default_members.contains(&id) {
+                if !default_members.contains(id) {
                     return false;
                 }
 
@@ -128,7 +128,7 @@ fn get_default_member(metadata: &serde_json::Value) -> &str {
             .collect()
     };
 
-    if packages.len() == 0 {
+    if packages.is_empty() {
         error_msg!("OSDK requires there's at least one kernel package. Please navigate to the kernel package directory or the workspace root and run the command.");
         std::process::exit(Errno::BuildCrate as _);
     }