Browse Source

Apply rustfmt

pull/4/head
AzureMarker 3 years ago
parent
commit
5c8013d5ba
No known key found for this signature in database
GPG Key ID: 47A133F3BF9D03D3
  1. 64
      src/main.rs

64
src/main.rs

@ -1,7 +1,7 @@
use cargo_metadata::MetadataCommand; use cargo_metadata::MetadataCommand;
use rustc_version::{Version, Channel}; use rustc_version::{Channel, Version};
use std::{ use std::{
env, fs, fmt, env, fmt, fs,
process::{self, Command, Stdio}, process::{self, Command, Stdio},
}; };
@ -38,7 +38,11 @@ impl fmt::Display for CommitDate {
} }
} }
const MINIMUM_COMMIT_DATE: CommitDate = CommitDate { year: 2021, month: 10, day: 01 }; const MINIMUM_COMMIT_DATE: CommitDate = CommitDate {
year: 2021,
month: 10,
day: 01,
};
const MINIMUM_RUSTC_VERSION: Version = Version::new(1, 56, 0); const MINIMUM_RUSTC_VERSION: Version = Version::new(1, 56, 0);
fn main() { fn main() {
@ -56,13 +60,11 @@ fn main() {
let command = args.next(); let command = args.next();
let must_link = match command { let must_link = match command {
None => panic!("No command specified, try with \"build\" or \"link\""), None => panic!("No command specified, try with \"build\" or \"link\""),
Some(s) => { Some(s) => match s.as_str() {
match s.as_str() {
"build" => false, "build" => false,
"link" => true, "link" => true,
_ => panic!("Invalid command, try with \"build\" or \"link\""), _ => panic!("Invalid command, try with \"build\" or \"link\""),
} },
}
}; };
build_elf(args); build_elf(args);
@ -91,8 +93,10 @@ fn check_rust_version() {
let old_commit = match rustc_version.commit_date { let old_commit = match rustc_version.commit_date {
None => false, None => false,
Some(date) => MINIMUM_COMMIT_DATE > CommitDate::parse(&date) Some(date) => {
.expect("could not parse `rustc --version` commit date"), MINIMUM_COMMIT_DATE
> CommitDate::parse(&date).expect("could not parse `rustc --version` commit date")
}
}; };
if old_version || old_commit { if old_version || old_commit {
@ -100,9 +104,7 @@ fn check_rust_version() {
"cargo-3ds requires rustc nightly version >= {}", "cargo-3ds requires rustc nightly version >= {}",
MINIMUM_COMMIT_DATE, MINIMUM_COMMIT_DATE,
); );
println!( println!("Please run `rustup update nightly` to upgrade your nightly version");
"Please run `rustup update nightly` to upgrade your nightly version"
);
process::exit(1); process::exit(1);
} }
@ -147,7 +149,10 @@ fn get_metadata() -> CTRConfig {
let icon = String::from("./icon.png"); let icon = String::from("./icon.png");
let icon = if let Err(_) = fs::File::open(&icon) { let icon = if let Err(_) = fs::File::open(&icon) {
format!("{}/libctru/default_icon.png", env::var("DEVKITPRO").unwrap()) format!(
"{}/libctru/default_icon.png",
env::var("DEVKITPRO").unwrap()
)
} else { } else {
icon icon
}; };
@ -155,7 +160,10 @@ fn get_metadata() -> CTRConfig {
CTRConfig { CTRConfig {
name: root_crate.name.clone(), name: root_crate.name.clone(),
author: root_crate.authors[0].clone(), author: root_crate.authors[0].clone(),
description: root_crate.description.clone().unwrap_or(String::from("Homebrew Application")), description: root_crate
.description
.clone()
.unwrap_or(String::from("Homebrew Application")),
icon: icon, icon: icon,
} }
} }
@ -167,7 +175,10 @@ fn build_3dsx(config: &CTRConfig, opt_lvl: &str) {
.arg(&config.description) .arg(&config.description)
.arg(&config.author) .arg(&config.author)
.arg(&config.icon) .arg(&config.icon)
.arg(format!("./target/armv6k-nintendo-3ds/{}/{}.smdh", opt_lvl, config.name)) .arg(format!(
"./target/armv6k-nintendo-3ds/{}/{}.smdh",
opt_lvl, config.name
))
.stdin(Stdio::inherit()) .stdin(Stdio::inherit())
.stdout(Stdio::inherit()) .stdout(Stdio::inherit())
.stderr(Stdio::inherit()) .stderr(Stdio::inherit())
@ -187,16 +198,26 @@ fn build_3dsx(config: &CTRConfig, opt_lvl: &str) {
let mut command = Command::new("3dsxtool"); let mut command = Command::new("3dsxtool");
let mut process = command let mut process = command
.arg(format!("./target/armv6k-nintendo-3ds/{}/{}.elf", opt_lvl, config.name)) .arg(format!(
.arg(format!("./target/armv6k-nintendo-3ds/{}/{}.3dsx", opt_lvl, config.name)) "./target/armv6k-nintendo-3ds/{}/{}.elf",
.arg(format!("--smdh=./target/armv6k-nintendo-3ds/{}/{}.smdh", opt_lvl, config.name)); opt_lvl, config.name
))
.arg(format!(
"./target/armv6k-nintendo-3ds/{}/{}.3dsx",
opt_lvl, config.name
))
.arg(format!(
"--smdh=./target/armv6k-nintendo-3ds/{}/{}.smdh",
opt_lvl, config.name
));
// If romfs directory exists, automatically include it // If romfs directory exists, automatically include it
if let Ok(_) = std::fs::read_dir("./romfs") { if let Ok(_) = std::fs::read_dir("./romfs") {
process = process.arg("--romfs=\"./romfs\""); process = process.arg("--romfs=\"./romfs\"");
} }
let mut process = process.stdin(Stdio::inherit()) let mut process = process
.stdin(Stdio::inherit())
.stdout(Stdio::inherit()) .stdout(Stdio::inherit())
.stderr(Stdio::inherit()) .stderr(Stdio::inherit())
.spawn() .spawn()
@ -216,7 +237,10 @@ fn build_3dsx(config: &CTRConfig, opt_lvl: &str) {
fn link(name: &str, opt_lvl: &str) { fn link(name: &str, opt_lvl: &str) {
let mut process = Command::new("3dslink") let mut process = Command::new("3dslink")
.arg(format!("./target/armv6k-nintendo-3ds/{}/{}.3dsx", opt_lvl, name)) .arg(format!(
"./target/armv6k-nintendo-3ds/{}/{}.3dsx",
opt_lvl, name
))
.stdin(Stdio::inherit()) .stdin(Stdio::inherit())
.stdout(Stdio::inherit()) .stdout(Stdio::inherit())
.stderr(Stdio::inherit()) .stderr(Stdio::inherit())

Loading…
Cancel
Save