update httpmock generation to support 0.8 (#1264)

Author: ahl

cargo-progenitor/tests/test_cmd.rs

@@ -1,11 +1,8 @@
 // Copyright 2025 Oxide Computer Company
 
-use assert_cmd::Command;
-
 #[test]
 fn test_help() {
-    Command::cargo_bin("cargo-progenitor")
-        .unwrap()
+    assert_cmd::cargo::cargo_bin_cmd!()
         .arg("progenitor")
         .arg("--help")
         .assert()

progenitor-impl/src/httpmock.rs

@@ -208,15 +208,7 @@ impl Generator {
                                     value.to_string(),
                                 ))
                             } else {
-                                Self(self.0.matches(|req| {
-                                    req.query_params
-                                        .as_ref()
-                                        .and_then(|qs| {
-                                            qs.iter().find(
-                                                |(key, _)| key == #api_name)
-                                        })
-                                        .is_none()
-                                }))
+                                Self(self.0.query_param_missing(#api_name))
                             }
                         },
                     ),
@@ -229,16 +221,7 @@ impl Generator {
                                     value.to_string()
                                 ))
                             } else {
-                                Self(self.0.matches(|req| {
-                                    req.headers
-                                        .as_ref()
-                                        .and_then(|hs| {
-                                            hs.iter().find(
-                                                |(key, _)| key == #api_name
-                                            )
-                                        })
-                                        .is_none()
-                                }))
+                                Self(self.0.header_missing(#api_name))
                             }
                         },
                     ),
@@ -247,7 +230,6 @@ impl Generator {
                             true,
                             quote! {
                                 Self(self.0.json_body_obj(value))
-
                             },
                         ),
                         OperationParameterType::RawBody => match body_content_type {

progenitor-impl/tests/output/src/buildomat_httpmock.rs

@@ -210,12 +210,7 @@ pub mod operations {
             if let Some(value) = value.into() {
                 Self(self.0.query_param("minseq", value.to_string()))
             } else {
-                Self(self.0.matches(|req| {
-                    req.query_params
-                        .as_ref()
-                        .and_then(|qs| qs.iter().find(|(key, _)| key == "minseq"))
-                        .is_none()
-                }))
+                Self(self.0.query_param_missing("minseq"))
             }
         }
     }
@@ -763,12 +758,7 @@ pub mod operations {
             if let Some(value) = value.into() {
                 Self(self.0.query_param("id", value.to_string()))
             } else {
-                Self(self.0.matches(|req| {
-                    req.query_params
-                        .as_ref()
-                        .and_then(|qs| qs.iter().find(|(key, _)| key == "id"))
-                        .is_none()
-                }))
+                Self(self.0.query_param_missing("id"))
             }
         }
     }
@@ -814,12 +804,7 @@ pub mod operations {
             if let Some(value) = value.into() {
                 Self(self.0.header("accept-language", value.to_string()))
             } else {
-                Self(self.0.matches(|req| {
-                    req.headers
-                        .as_ref()
-                        .and_then(|hs| hs.iter().find(|(key, _)| key == "accept-language"))
-                        .is_none()
-                }))
+                Self(self.0.header_missing("accept-language"))
             }
         }
     }