mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-19 09:00:54 +00:00
xtask: rustfmt
This commit is contained in:
parent
ec31a592ab
commit
e7da909372
2 changed files with 10 additions and 33 deletions
|
|
@ -175,10 +175,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||||
}
|
}
|
||||||
// ----- renode configs --------
|
// ----- renode configs --------
|
||||||
Some("renode-image") => {
|
Some("renode-image") => {
|
||||||
builder
|
builder.target_renode().add_services(&user_pkgs).add_apps(&get_cratespecs());
|
||||||
.target_renode()
|
|
||||||
.add_services(&user_pkgs)
|
|
||||||
.add_apps(&get_cratespecs());
|
|
||||||
}
|
}
|
||||||
Some("renode-image-debug") => {
|
Some("renode-image-debug") => {
|
||||||
builder
|
builder
|
||||||
|
|
@ -188,23 +185,14 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||||
.add_apps(&get_cratespecs());
|
.add_apps(&get_cratespecs());
|
||||||
}
|
}
|
||||||
Some("renode-test") => {
|
Some("renode-test") => {
|
||||||
builder
|
builder.target_renode().add_services(&base_pkgs).add_services(&get_cratespecs());
|
||||||
.target_renode()
|
|
||||||
.add_services(&base_pkgs)
|
|
||||||
.add_services(&get_cratespecs());
|
|
||||||
}
|
}
|
||||||
Some("libstd-test") => {
|
Some("libstd-test") => {
|
||||||
builder
|
builder.target_renode().add_services(&base_pkgs).add_services(&get_cratespecs());
|
||||||
.target_renode()
|
|
||||||
.add_services(&base_pkgs)
|
|
||||||
.add_services(&get_cratespecs());
|
|
||||||
builder.add_loader_feature("renode-bypass");
|
builder.add_loader_feature("renode-bypass");
|
||||||
}
|
}
|
||||||
Some("libstd-net") => {
|
Some("libstd-net") => {
|
||||||
builder
|
builder.target_renode().add_services(&base_pkgs).add_services(&get_cratespecs());
|
||||||
.target_renode()
|
|
||||||
.add_services(&base_pkgs)
|
|
||||||
.add_services(&get_cratespecs());
|
|
||||||
builder.add_loader_feature("renode-bypass").add_loader_feature("renode-minimal");
|
builder.add_loader_feature("renode-bypass").add_loader_feature("renode-minimal");
|
||||||
builder
|
builder
|
||||||
.add_service("net", false)
|
.add_service("net", false)
|
||||||
|
|
@ -213,16 +201,10 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||||
.add_service("dns", false);
|
.add_service("dns", false);
|
||||||
}
|
}
|
||||||
Some("renode-aes-test") => {
|
Some("renode-aes-test") => {
|
||||||
builder
|
builder.target_renode().add_services(&aes_test_pkgs).add_services(&get_cratespecs());
|
||||||
.target_renode()
|
|
||||||
.add_services(&aes_test_pkgs)
|
|
||||||
.add_services(&get_cratespecs());
|
|
||||||
}
|
}
|
||||||
Some("ffi-test") => {
|
Some("ffi-test") => {
|
||||||
builder
|
builder.target_renode().add_services(&gfx_base_pkgs).add_services(&get_cratespecs());
|
||||||
.target_renode()
|
|
||||||
.add_services(&gfx_base_pkgs)
|
|
||||||
.add_services(&get_cratespecs());
|
|
||||||
builder.add_service("ffi-test", false);
|
builder.add_service("ffi-test", false);
|
||||||
builder.add_loader_feature("renode-bypass");
|
builder.add_loader_feature("renode-bypass");
|
||||||
}
|
}
|
||||||
|
|
@ -274,11 +256,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||||
.add_feature("graphics-server/gfx-testing");
|
.add_feature("graphics-server/gfx-testing");
|
||||||
}
|
}
|
||||||
Some("hosted-ci") => {
|
Some("hosted-ci") => {
|
||||||
builder
|
builder.target_hosted().add_services(&user_pkgs).hosted_build_only().add_apps(&get_cratespecs());
|
||||||
.target_hosted()
|
|
||||||
.add_services(&user_pkgs)
|
|
||||||
.hosted_build_only()
|
|
||||||
.add_apps(&get_cratespecs());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// ------ Precursor hardware image configs ------
|
// ------ Precursor hardware image configs ------
|
||||||
|
|
@ -396,9 +374,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||||
.add_feature("avalanchetest");
|
.add_feature("avalanchetest");
|
||||||
}
|
}
|
||||||
Some("compile-apps") => {
|
Some("compile-apps") => {
|
||||||
builder
|
builder.target_precursor_no_image(PRECURSOR_SOC_VERSION).add_services(&gfx_base_pkgs);
|
||||||
.target_precursor_no_image(PRECURSOR_SOC_VERSION)
|
|
||||||
.add_services(&gfx_base_pkgs);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// ------ Cramium hardware image configs ------
|
// ------ Cramium hardware image configs ------
|
||||||
|
|
|
||||||
|
|
@ -181,7 +181,8 @@ pub(crate) fn ensure_compiler(
|
||||||
version_path.push(target);
|
version_path.push(target);
|
||||||
if remove_existing {
|
if remove_existing {
|
||||||
println!("Target path exists, removing it");
|
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");
|
println!("Also removing target directories for existing toolchain");
|
||||||
let mut target_main = project_root();
|
let mut target_main = project_root();
|
||||||
target_main.push("target");
|
target_main.push("target");
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue