From e7da909372c5144f4759d1de54469e5dae1924da Mon Sep 17 00:00:00 2001 From: eupn Date: Sun, 31 Mar 2024 21:34:17 +0400 Subject: [PATCH] xtask: rustfmt --- xtask/src/main.rs | 40 ++++++++-------------------------------- xtask/src/utils.rs | 3 ++- 2 files changed, 10 insertions(+), 33 deletions(-) diff --git a/xtask/src/main.rs b/xtask/src/main.rs index 3d46e79f0..62856be29 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -175,10 +175,7 @@ fn main() -> Result<(), Box> { } // ----- renode configs -------- Some("renode-image") => { - builder - .target_renode() - .add_services(&user_pkgs) - .add_apps(&get_cratespecs()); + builder.target_renode().add_services(&user_pkgs).add_apps(&get_cratespecs()); } Some("renode-image-debug") => { builder @@ -188,23 +185,14 @@ fn main() -> Result<(), Box> { .add_apps(&get_cratespecs()); } Some("renode-test") => { - builder - .target_renode() - .add_services(&base_pkgs) - .add_services(&get_cratespecs()); + builder.target_renode().add_services(&base_pkgs).add_services(&get_cratespecs()); } Some("libstd-test") => { - builder - .target_renode() - .add_services(&base_pkgs) - .add_services(&get_cratespecs()); + builder.target_renode().add_services(&base_pkgs).add_services(&get_cratespecs()); builder.add_loader_feature("renode-bypass"); } Some("libstd-net") => { - builder - .target_renode() - .add_services(&base_pkgs) - .add_services(&get_cratespecs()); + builder.target_renode().add_services(&base_pkgs).add_services(&get_cratespecs()); builder.add_loader_feature("renode-bypass").add_loader_feature("renode-minimal"); builder .add_service("net", false) @@ -213,16 +201,10 @@ fn main() -> Result<(), Box> { .add_service("dns", false); } Some("renode-aes-test") => { - builder - .target_renode() - .add_services(&aes_test_pkgs) - .add_services(&get_cratespecs()); + builder.target_renode().add_services(&aes_test_pkgs).add_services(&get_cratespecs()); } Some("ffi-test") => { - builder - .target_renode() - .add_services(&gfx_base_pkgs) - .add_services(&get_cratespecs()); + builder.target_renode().add_services(&gfx_base_pkgs).add_services(&get_cratespecs()); builder.add_service("ffi-test", false); builder.add_loader_feature("renode-bypass"); } @@ -274,11 +256,7 @@ fn main() -> Result<(), Box> { .add_feature("graphics-server/gfx-testing"); } Some("hosted-ci") => { - builder - .target_hosted() - .add_services(&user_pkgs) - .hosted_build_only() - .add_apps(&get_cratespecs()); + builder.target_hosted().add_services(&user_pkgs).hosted_build_only().add_apps(&get_cratespecs()); } // ------ Precursor hardware image configs ------ @@ -396,9 +374,7 @@ fn main() -> Result<(), Box> { .add_feature("avalanchetest"); } Some("compile-apps") => { - builder - .target_precursor_no_image(PRECURSOR_SOC_VERSION) - .add_services(&gfx_base_pkgs); + builder.target_precursor_no_image(PRECURSOR_SOC_VERSION).add_services(&gfx_base_pkgs); } // ------ Cramium hardware image configs ------ diff --git a/xtask/src/utils.rs b/xtask/src/utils.rs index 8f471610f..464a3e04e 100644 --- a/xtask/src/utils.rs +++ b/xtask/src/utils.rs @@ -181,7 +181,8 @@ pub(crate) fn ensure_compiler( version_path.push(target); if remove_existing { println!("Target path exists, removing it"); - std::fs::remove_dir_all(version_path).map_err(|e| format!("unable to remove existing toolchain: {}", e))?; + std::fs::remove_dir_all(version_path) + .map_err(|e| format!("unable to remove existing toolchain: {}", e))?; println!("Also removing target directories for existing toolchain"); let mut target_main = project_root(); target_main.push("target");