Merge #1052

1052: Update cross-util program name and version. r=Emilgardis a=Alexhuszagh

Updates to output of `cross-util --version` to use the program name `cross-util`, and in development builds, add the commit hash (so, for example, the output might be `cross-util 0.2.4 (8d8d84b 2022-09-08)`). The previous output would have been `cross 0.2.4`.

Co-authored-by: Alex Huszagh <ahuszagh@gmail.com>

Author: bors[bot]

Cargo.toml

@@ -61,7 +61,7 @@ lto = true
 
 [dev-dependencies]
 regex = "1"
-once_cell = "1"
+once_cell = "1.15"
 ignore = "0.4"
 
 [package.metadata.release]

src/bin/cross-util.rs

@@ -6,8 +6,11 @@ use cross::{docker, rustc::Toolchain};
 
 mod commands;
 
+const APP_NAME: &str = "cross-util";
+static VERSION: &str = concat!(env!("CARGO_PKG_VERSION"), cross::commit_info!());
+
 #[derive(Parser, Debug)]
-#[clap(version, about, long_about = None)]
+#[clap(about, long_about = None, name = APP_NAME, version = VERSION)]
 struct Cli {
     /// Toolchain name/version to use (such as stable or 1.59.0).
     #[clap(value_parser = is_toolchain)]

src/lib.rs

@@ -501,9 +501,10 @@ pub fn run(
     msg_info: &mut MessageInfo,
 ) -> Result<Option<ExitStatus>> {
     if args.version && args.subcommand.is_none() {
-        msg_info.print(format_args!(
-            concat!("cross ", env!("CARGO_PKG_VERSION"), "{}"),
-            crate::commit_info()
+        msg_info.print(concat!(
+            "cross ",
+            env!("CARGO_PKG_VERSION"),
+            crate::commit_info!()
         ))?;
     }
 
@@ -780,8 +781,15 @@ pub(crate) fn warn_host_version_mismatch(
     Ok(VersionMatch::Same)
 }
 
-fn commit_info() -> &'static str {
-    include_str!(concat!(env!("OUT_DIR"), "/commit-info.txt"))
+pub const fn commit_info() -> &'static str {
+    commit_info!()
+}
+
+#[macro_export]
+macro_rules! commit_info {
+    () => {
+        include_str!(concat!(env!("OUT_DIR"), "/commit-info.txt"))
+    };
 }
 
 /// Obtains the [`CrossToml`] from one of the possible locations