Add package name to help text

src/cargo.rs

@@ -105,8 +105,7 @@ crate fn run(args: &cli::BuildArgs) -> Result<CargoArtifact, SubcommandError> {
 }
 
 fn split_output(json: &str) -> (Vec<&str>, Vec<&str>) {
-    json
-        .trim()
+    json.trim()
         .split('\n')
         .filter(|x| x.find(r#""reason":"build-script-executed""#).is_none())
         .partition(|x| x.find(r#""reason":"compiler-artifact""#).is_some())

src/cli.rs

@@ -98,18 +98,28 @@ crate fn parse_args() -> Result<Args, ArgParseError> {
     // Process common arguments
     for arg in args {
         if arg == "--help" || arg == "-h" {
-            eprintln!(include_str!("templates/help.fmt"), target);
+            eprintln!(
+                include_str!("templates/help.fmt"),
+                env!("CARGO_PKG_NAME"),
+                target
+            );
             process::exit(0);
         } else if arg == "--version" || arg == "-V" {
-            eprintln!("Version {}", env!("CARGO_PKG_VERSION"));
+            eprintln!(
+                "{}\nVersion {}",
+                env!("CARGO_PKG_NAME"),
+                env!("CARGO_PKG_VERSION")
+            );
             process::exit(0);
         } else {
             rest.push(arg.to_owned());
         }
     }
 
     // Check subcommand after handling --help and --version
-    if let Subcommand::None = subcommand { Err(MissingSubcommand)? }
+    if let Subcommand::None = subcommand {
+        Err(MissingSubcommand)?
+    }
 
     Ok(Args {
         subcommand,

src/templates/help.fmt

@@ -1,3 +1,4 @@
+{}
 Nintendo 64 build tool
 
 USAGE: