Samuka007/asterinas
1
0
Fork 0
mirror of https://github.com/asterinas/asterinas.git synced 2025-06-09 13:26:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename utils to util

Browse Source
This commit is contained in:
Zhang Junyang 2024-02-27 09:53:39 +08:00 committed by Tate, Hongliang Tian
parent d98ed8cec1
commit 674c35079c
13 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osdk/src/commands/build/bin.rs
View File

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

2
osdk/src/commands/build/grub.rs
View File

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

4
osdk/src/commands/build/mod.rs
View File

@ -11,7 +11,7 @@ use std::{
use bin::strip_elf_for_qemu; 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::{ use crate::{
base_crate::new_base_crate, base_crate::new_base_crate,
bundle::{ bundle::{
@ -23,7 +23,7 @@ use crate::{
config_manager::{qemu::QemuMachine, BuildConfig}, config_manager::{qemu::QemuMachine, BuildConfig},
error::Errno, error::Errno,
error_msg, 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) { pub fn execute_build_command(config: &BuildConfig) {

4
osdk/src/commands/check.rs
View File

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

4
osdk/src/commands/clippy.rs
View File

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

2
osdk/src/commands/mod.rs
View File

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

2
osdk/src/commands/new/mod.rs
View File

@ -12,7 +12,7 @@ use crate::{
cli::NewArgs, cli::NewArgs,
error::Errno, error::Errno,
error_msg, 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) { pub fn execute_new_command(args: &NewArgs) {

4
osdk/src/commands/run.rs
View File

@ -5,11 +5,11 @@ use std::{
time::{Duration, SystemTime}, 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::{ use crate::{
bundle::Bundle, bundle::Bundle,
config_manager::{BuildConfig, RunConfig}, 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) { pub fn execute_run_command(config: &RunConfig) {

4
osdk/src/commands/test.rs
View File

@ -2,11 +2,11 @@
use std::fs; use std::fs;
use super::{build::do_build, utils::DEFAULT_TARGET_RELPATH}; use super::{build::do_build, util::DEFAULT_TARGET_RELPATH};
use crate::{ use crate::{
base_crate::new_base_crate, base_crate::new_base_crate,
config_manager::{BuildConfig, RunConfig, TestConfig}, 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) { pub fn execute_test_command(config: &TestConfig) {

2
osdk/src/commands/utils.rs → osdk/src/commands/util.rs
View File

@ -2,7 +2,7 @@
use std::{fs, path::PathBuf, process::Command}; 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] = &[ pub const COMMON_CARGO_ARGS: &[&str] = &[
"-Zbuild-std=core,alloc,compiler_builtins", "-Zbuild-std=core,alloc,compiler_builtins",

2
osdk/src/config_manager/mod.rs
View File

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

2
osdk/src/main.rs
View File

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

0
osdk/src/utils.rs → osdk/src/util.rs
View File