Auto merge of #698 - lqd:cancel_equals_abort, r=Mark-Simulacrum

cancel = abort This PR allows patterns to be used in the webhooks command parser, for the sole purpose of accepting `cancel` as an alias to `abort`. <sub>(this is for `@compiler-errors)</sub>`
rust-lang · Sep 12, 2023 · fa857ef · fa857ef
2 parents 48c666a + ff92dc1
commit fa857ef
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/cli.rs b/src/cli.rs
@@ -521,7 +521,7 @@ impl Crater {
                 } else {
                     default_capabilities_for_target()
                 };
-                caps.extend(capabilities.clone().into_iter());
+                caps.extend(capabilities.clone());
 
                 agent::run(
                     url,

diff --git a/src/server/routes/webhooks/args.rs b/src/server/routes/webhooks/args.rs
@@ -17,10 +17,10 @@ pub enum CommandParseError {
 
 macro_rules! generate_parser {
     (pub enum $enum:ident {
-        $($command:expr => $variant:ident($var_struct:ident {
+        $($command:pat => $variant:ident($var_struct:ident {
             $($flag:ident: $type:ty = $name:expr,)*
         }))*
-        _ => $d_variant:ident($d_var_struct:ident {$($d_flag:ident: $d_type:ty = $d_name:expr,)*})
+        => $d_variant:ident($d_var_struct:ident {$($d_flag:ident: $d_type:ty = $d_name:expr,)*})
     }) => {
         use crate::prelude::*;
         use std::str::FromStr;
@@ -128,7 +128,7 @@ generate_parser!(pub enum Command {
         requirement: Option<String> = "requirement",
     })
 
-    "abort" => Abort(AbortArgs {
+    "abort" | "cancel" => Abort(AbortArgs {
         name: Option<String> = "name",
     })
 
@@ -144,7 +144,7 @@ generate_parser!(pub enum Command {
 
     "reload-acl" => ReloadACL(ReloadACLArgs {})
 
-    _ => Edit(EditArgs {
+    => Edit(EditArgs {
         name: Option<String> = "name",
         start: Option<Toolchain> = "start",
         end: Option<Toolchain> = "end",
@@ -169,11 +169,11 @@ mod tests {
             arg2: Option<String> = "arg2",
         })
 
-        "bar" => Bar(BarArgs {
+        "bar" | "bar-alias" => Bar(BarArgs {
             arg3: Option<String> = "arg3",
         })
 
-        _ => Baz(BazArgs {
+        => Baz(BazArgs {
             arg4: Option<i32> = "arg4",
         })
     });
@@ -201,6 +201,7 @@ mod tests {
             })
         );
         test!("bar", TestCommand::Bar(BarArgs { arg3: None }));
+        test!("bar-alias", TestCommand::Bar(BarArgs { arg3: None }));
         test!("", TestCommand::Baz(BazArgs { arg4: None }));
 
         // Test if args are parsed correctly
@@ -230,6 +231,12 @@ mod tests {
                 arg3: Some("foo \" bar".into()),
             })
         );
+        test!(
+            "bar-alias arg3=\"foo \\\" bar\"",
+            TestCommand::Bar(BarArgs {
+                arg3: Some("foo \" bar".into()),
+            })
+        );
         test!("arg4=42", TestCommand::Baz(BazArgs { arg4: Some(42) }));
 
         // Test if invalid args are rejected