Rename utils to util

osdk/src/commands/build/bin.rs

@@ -15,7 +15,7 @@ use crate::{
         file::BundleFile,
     },
     config_manager::boot::BootProtocol,
-    utils::get_current_crate_info,
+    util::get_current_crate_info,
 };
 
 pub fn make_install_bzimage(

osdk/src/commands/build/grub.rs

@@ -13,7 +13,7 @@ use crate::{
         vm_image::{AsterGrubIsoImageMeta, AsterVmImage, AsterVmImageType},
     },
     config_manager::{boot::BootProtocol, BuildConfig},
-    utils::get_current_crate_info,
+    util::get_current_crate_info,
 };
 
 pub fn create_bootdev_image(

osdk/src/commands/build/mod.rs

@@ -11,7 +11,7 @@ use std::{
 
 use bin::strip_elf_for_qemu;
 
-use super::utils::{cargo, COMMON_CARGO_ARGS, DEFAULT_TARGET_RELPATH};
+use super::util::{cargo, COMMON_CARGO_ARGS, DEFAULT_TARGET_RELPATH};
 use crate::{
     base_crate::new_base_crate,
     bundle::{
@@ -23,7 +23,7 @@ use crate::{
     config_manager::{qemu::QemuMachine, BuildConfig},
     error::Errno,
     error_msg,
-    utils::{get_current_crate_info, get_target_directory},
+    util::{get_current_crate_info, get_target_directory},
 };
 
 pub fn execute_build_command(config: &BuildConfig) {

osdk/src/commands/check.rs

@@ -2,8 +2,8 @@
 
 use std::process;
 
-use super::utils::{cargo, COMMON_CARGO_ARGS};
-use crate::{commands::utils::create_target_json, error::Errno, error_msg};
+use super::util::{cargo, COMMON_CARGO_ARGS};
+use crate::{commands::util::create_target_json, error::Errno, error_msg};
 
 pub fn execute_check_command() {
     let target_json_path = create_target_json();

osdk/src/commands/clippy.rs

@@ -2,8 +2,8 @@
 
 use std::process;
 
-use super::utils::{cargo, COMMON_CARGO_ARGS};
-use crate::{commands::utils::create_target_json, error::Errno, error_msg};
+use super::util::{cargo, COMMON_CARGO_ARGS};
+use crate::{commands::util::create_target_json, error::Errno, error_msg};
 
 pub fn execute_clippy_command() {
     let target_json_path = create_target_json();

osdk/src/commands/mod.rs

@@ -8,7 +8,7 @@ mod clippy;
 mod new;
 mod run;
 mod test;
-mod utils;
+mod util;
 
 pub use self::{
     build::execute_build_command, check::execute_check_command, clippy::execute_clippy_command,

osdk/src/commands/new/mod.rs

@@ -12,7 +12,7 @@ use crate::{
     cli::NewArgs,
     error::Errno,
     error_msg,
-    utils::{cargo_new_lib, get_cargo_metadata, ASTER_FRAME_DEP, KTEST_DEP},
+    util::{cargo_new_lib, get_cargo_metadata, ASTER_FRAME_DEP, KTEST_DEP},
 };
 
 pub fn execute_new_command(args: &NewArgs) {

osdk/src/commands/run.rs

@@ -5,11 +5,11 @@ use std::{
     time::{Duration, SystemTime},
 };
 
-use super::{build::create_base_and_build, utils::DEFAULT_TARGET_RELPATH};
+use super::{build::create_base_and_build, util::DEFAULT_TARGET_RELPATH};
 use crate::{
     bundle::Bundle,
     config_manager::{BuildConfig, RunConfig},
-    utils::{get_cargo_metadata, get_current_crate_info, get_target_directory},
+    util::{get_cargo_metadata, get_current_crate_info, get_target_directory},
 };
 
 pub fn execute_run_command(config: &RunConfig) {

osdk/src/commands/test.rs

@@ -2,11 +2,11 @@
 
 use std::fs;
 
-use super::{build::do_build, utils::DEFAULT_TARGET_RELPATH};
+use super::{build::do_build, util::DEFAULT_TARGET_RELPATH};
 use crate::{
     base_crate::new_base_crate,
     config_manager::{BuildConfig, RunConfig, TestConfig},
-    utils::{get_current_crate_info, get_target_directory},
+    util::{get_current_crate_info, get_target_directory},
 };
 
 pub fn execute_test_command(config: &TestConfig) {

osdk/src/commands/util.rs

@@ -2,7 +2,7 @@
 
 use std::{fs, path::PathBuf, process::Command};
 
-use crate::utils::get_target_directory;
+use crate::util::get_target_directory;
 
 pub const COMMON_CARGO_ARGS: &[&str] = &[
     "-Zbuild-std=core,alloc,compiler_builtins",

osdk/src/config_manager/mod.rs

@@ -25,7 +25,7 @@ use crate::{
     cli::{BuildArgs, CargoArgs, OsdkArgs, RunArgs, TestArgs},
     error::Errno,
     error_msg,
-    utils::get_cargo_metadata,
+    util::get_cargo_metadata,
     warn_msg,
 };
 

osdk/src/main.rs

@@ -13,7 +13,7 @@ mod cli;
 mod commands;
 mod config_manager;
 mod error;
-mod utils;
+mod util;
 
 fn main() {
     // init logger