Extend msg and description to work with any subcommand

Previously `description` only supported `Testing` and `Benchmarking`,
and `msg` gave weird results for `doc` (it would say `Docing`).
This commit is contained in:
jyn
2023-05-25 13:33:43 -05:00
parent 20372f1817
commit cb4b7f6319
3 changed files with 9 additions and 5 deletions
+6 -2
View File
@@ -644,12 +644,16 @@ pub fn as_str(&self) -> &'static str {
}
}
pub fn test_description(&self) -> &'static str {
pub fn description(&self) -> String {
match self {
Kind::Test => "Testing",
Kind::Bench => "Benchmarking",
_ => panic!("not a test command: {}!", self.as_str()),
Kind::Doc => "Documenting",
Kind::Run => "Running",
Kind::Suggest => "Suggesting",
_ => return format!("{self:?}"),
}
.to_owned()
}
}
+2 -2
View File
@@ -1020,8 +1020,8 @@ fn msg(
host: impl Into<Option<TargetSelection>>,
target: impl Into<Option<TargetSelection>>,
) -> Option<gha::Group> {
let action = action.into();
let msg = |fmt| format!("{action:?}ing stage{stage} {what}{fmt}");
let action = action.into().description();
let msg = |fmt| format!("{action} stage{stage} {what}{fmt}");
let msg = if let Some(target) = target.into() {
let host = host.into().unwrap();
if host == target {
+1 -1
View File
@@ -101,7 +101,7 @@ fn run(self, builder: &Builder<'_>) {
);
builder.info(&format!(
"{} {} stage0 ({})",
builder.kind.test_description(),
builder.kind.description(),
path,
bootstrap_host,
));