Bump typify from `7b5f72b` to `f58c5e2` (#117)

* Bump typify from `7b5f72b` to `f58c5e2`

Bumps [typify](https://github.com/oxidecomputer/typify) from `7b5f72b` to `f58c5e2`.
- [Release notes](https://github.com/oxidecomputer/typify/releases)
- [Commits](7b5f72b1e4...f58c5e23b1)

---
updated-dependencies:
- dependency-name: typify
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>

* fixups and output update

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Adam H. Leventhal <ahl@oxide.computer>

Cargo.lock

@@ -958,6 +958,7 @@ dependencies = [
  "progenitor-client",
  "progenitor-impl",
  "progenitor-macro",
+ "regress",
  "reqwest",
  "schemars",
  "serde",
@@ -1062,6 +1063,15 @@ version = "0.6.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244"
 
+[[package]]
+name = "regress"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a92ff21fe8026ce3f2627faaf43606f0b67b014dbc9ccf027181a804f75d92e"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "remove_dir_all"
 version = "0.5.3"
@@ -1717,7 +1727,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
 [[package]]
 name = "typify"
 version = "0.0.10-dev"
-source = "git+https://github.com/oxidecomputer/typify#7b5f72b1e492d3b585791f13758a9d692876b633"
+source = "git+https://github.com/oxidecomputer/typify#77656de7b77f32ee7578ad4638dd928ee96138ad"
 dependencies = [
  "typify-impl",
  "typify-macro",
@@ -1726,12 +1736,13 @@ dependencies = [
 [[package]]
 name = "typify-impl"
 version = "0.0.10-dev"
-source = "git+https://github.com/oxidecomputer/typify#7b5f72b1e492d3b585791f13758a9d692876b633"
+source = "git+https://github.com/oxidecomputer/typify#77656de7b77f32ee7578ad4638dd928ee96138ad"
 dependencies = [
  "heck",
  "log",
  "proc-macro2",
  "quote",
+ "regress",
  "rustfmt-wrapper",
  "schemars",
  "serde_json",
@@ -1743,7 +1754,7 @@ dependencies = [
 [[package]]
 name = "typify-macro"
 version = "0.0.10-dev"
-source = "git+https://github.com/oxidecomputer/typify#7b5f72b1e492d3b585791f13758a9d692876b633"
+source = "git+https://github.com/oxidecomputer/typify#77656de7b77f32ee7578ad4638dd928ee96138ad"
 dependencies = [
  "proc-macro2",
  "quote",

progenitor-impl/src/lib.rs

@@ -395,13 +395,16 @@ impl Generator {
 
     pub fn dependencies(&self) -> Vec<String> {
         let mut deps = vec![
-            "bytes = \"1.1.0\"",
+            "bytes = \"1.1\"",
-            "futures-core = \"0.3.21\"",
+            "futures-core = \"0.3\"",
             "percent-encoding = \"2.1\"",
             "reqwest = { version = \"0.11\", features = [\"json\", \"stream\"] }",
             "serde = { version = \"1.0\", features = [\"derive\"] }",
             "serde_urlencoded = 0.7",
         ];
+        if self.type_space.uses_regress() {
+            deps.push("regress = 0.4")
+        }
         if self.type_space.uses_uuid() {
             deps.push(
                 "uuid = { version = \">=0.8.0, <2.0.0\", features = [\"serde\", \"v4\"] }",

progenitor-impl/tests/output/buildomat-builder-tagged.out

@@ -3,7 +3,7 @@ use progenitor_client::{encode_path, RequestBuilderExt};
 pub use progenitor_client::{ByteStream, Error, ResponseValue};
 pub mod types {
     use serde::{Deserialize, Serialize};
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct Task {
         pub id: String,
         pub name: String,
@@ -12,7 +12,7 @@ pub mod types {
         pub state: String,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct TaskEvent {
         pub payload: String,
         pub seq: u32,
@@ -20,14 +20,14 @@ pub mod types {
         pub time: chrono::DateTime<chrono::offset::Utc>,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct TaskOutput {
         pub id: String,
         pub path: String,
         pub size: u64,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct TaskSubmit {
         pub name: String,
         #[serde(default, skip_serializing_if = "Vec::is_empty")]
@@ -35,35 +35,35 @@ pub mod types {
         pub script: String,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct TaskSubmitResult {
         pub id: String,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct UploadedChunk {
         pub id: String,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct UserCreate {
         pub name: String,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct UserCreateResult {
         pub id: String,
         pub name: String,
         pub token: String,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct WhoamiResult {
         pub id: String,
         pub name: String,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct Worker {
         pub deleted: bool,
         pub id: String,
@@ -75,58 +75,58 @@ pub mod types {
         pub tasks: Vec<WorkerTask>,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct WorkerAddOutput {
         pub chunks: Vec<String>,
         pub path: String,
         pub size: i64,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct WorkerAppendTask {
         pub payload: String,
         pub stream: String,
         pub time: chrono::DateTime<chrono::offset::Utc>,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct WorkerBootstrap {
         pub bootstrap: String,
         pub token: String,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct WorkerBootstrapResult {
         pub id: String,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct WorkerCompleteTask {
         pub failed: bool,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct WorkerPingResult {
         pub poweroff: bool,
         #[serde(default, skip_serializing_if = "Option::is_none")]
         pub task: Option<WorkerPingTask>,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct WorkerPingTask {
         pub id: String,
         pub output_rules: Vec<String>,
         pub script: String,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct WorkerTask {
         pub id: String,
         pub name: String,
         pub owner: String,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct WorkersResult {
         pub workers: Vec<Worker>,
     }

progenitor-impl/tests/output/buildomat-builder.out

@@ -3,7 +3,7 @@ use progenitor_client::{encode_path, RequestBuilderExt};
 pub use progenitor_client::{ByteStream, Error, ResponseValue};
 pub mod types {
     use serde::{Deserialize, Serialize};
-    #[derive(Serialize, Deserialize, Debug, Clone, JsonSchema)]
+    #[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
     pub struct Task {
         pub id: String,
         pub name: String,
@@ -12,7 +12,7 @@ pub mod types {
         pub state: String,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone, JsonSchema)]
+    #[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
     pub struct TaskEvent {
         pub payload: String,
         pub seq: u32,
@@ -20,14 +20,14 @@ pub mod types {
         pub time: chrono::DateTime<chrono::offset::Utc>,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone, JsonSchema)]
+    #[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
     pub struct TaskOutput {
         pub id: String,
         pub path: String,
         pub size: u64,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone, JsonSchema)]
+    #[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
     pub struct TaskSubmit {
         pub name: String,
         #[serde(default, skip_serializing_if = "Vec::is_empty")]
@@ -35,35 +35,35 @@ pub mod types {
         pub script: String,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone, JsonSchema)]
+    #[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
     pub struct TaskSubmitResult {
         pub id: String,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone, JsonSchema)]
+    #[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
     pub struct UploadedChunk {
         pub id: String,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone, JsonSchema)]
+    #[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
     pub struct UserCreate {
         pub name: String,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone, JsonSchema)]
+    #[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
     pub struct UserCreateResult {
         pub id: String,
         pub name: String,
         pub token: String,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone, JsonSchema)]
+    #[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
     pub struct WhoamiResult {
         pub id: String,
         pub name: String,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone, JsonSchema)]
+    #[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
     pub struct Worker {
         pub deleted: bool,
         pub id: String,
@@ -75,58 +75,58 @@ pub mod types {
         pub tasks: Vec<WorkerTask>,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone, JsonSchema)]
+    #[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
     pub struct WorkerAddOutput {
         pub chunks: Vec<String>,
         pub path: String,
         pub size: i64,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone, JsonSchema)]
+    #[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
     pub struct WorkerAppendTask {
         pub payload: String,
         pub stream: String,
         pub time: chrono::DateTime<chrono::offset::Utc>,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone, JsonSchema)]
+    #[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
     pub struct WorkerBootstrap {
         pub bootstrap: String,
         pub token: String,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone, JsonSchema)]
+    #[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
     pub struct WorkerBootstrapResult {
         pub id: String,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone, JsonSchema)]
+    #[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
     pub struct WorkerCompleteTask {
         pub failed: bool,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone, JsonSchema)]
+    #[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
     pub struct WorkerPingResult {
         pub poweroff: bool,
         #[serde(default, skip_serializing_if = "Option::is_none")]
         pub task: Option<WorkerPingTask>,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone, JsonSchema)]
+    #[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
     pub struct WorkerPingTask {
         pub id: String,
         pub output_rules: Vec<String>,
         pub script: String,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone, JsonSchema)]
+    #[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
     pub struct WorkerTask {
         pub id: String,
         pub name: String,
         pub owner: String,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone, JsonSchema)]
+    #[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
     pub struct WorkersResult {
         pub workers: Vec<Worker>,
     }

progenitor-impl/tests/output/buildomat-positional.out

@@ -3,7 +3,7 @@ use progenitor_client::{encode_path, RequestBuilderExt};
 pub use progenitor_client::{ByteStream, Error, ResponseValue};
 pub mod types {
     use serde::{Deserialize, Serialize};
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct Task {
         pub id: String,
         pub name: String,
@@ -12,7 +12,7 @@ pub mod types {
         pub state: String,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct TaskEvent {
         pub payload: String,
         pub seq: u32,
@@ -20,14 +20,14 @@ pub mod types {
         pub time: chrono::DateTime<chrono::offset::Utc>,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct TaskOutput {
         pub id: String,
         pub path: String,
         pub size: u64,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct TaskSubmit {
         pub name: String,
         #[serde(default, skip_serializing_if = "Vec::is_empty")]
@@ -35,35 +35,35 @@ pub mod types {
         pub script: String,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct TaskSubmitResult {
         pub id: String,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct UploadedChunk {
         pub id: String,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct UserCreate {
         pub name: String,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct UserCreateResult {
         pub id: String,
         pub name: String,
         pub token: String,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct WhoamiResult {
         pub id: String,
         pub name: String,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct Worker {
         pub deleted: bool,
         pub id: String,
@@ -75,58 +75,58 @@ pub mod types {
         pub tasks: Vec<WorkerTask>,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct WorkerAddOutput {
         pub chunks: Vec<String>,
         pub path: String,
         pub size: i64,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct WorkerAppendTask {
         pub payload: String,
         pub stream: String,
         pub time: chrono::DateTime<chrono::offset::Utc>,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct WorkerBootstrap {
         pub bootstrap: String,
         pub token: String,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct WorkerBootstrapResult {
         pub id: String,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct WorkerCompleteTask {
         pub failed: bool,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct WorkerPingResult {
         pub poweroff: bool,
         #[serde(default, skip_serializing_if = "Option::is_none")]
         pub task: Option<WorkerPingTask>,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct WorkerPingTask {
         pub id: String,
         pub output_rules: Vec<String>,
         pub script: String,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct WorkerTask {
         pub id: String,
         pub name: String,
         pub owner: String,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct WorkersResult {
         pub workers: Vec<Worker>,
     }

progenitor-impl/tests/output/keeper-builder-tagged.out

@@ -3,31 +3,31 @@ use progenitor_client::{encode_path, RequestBuilderExt};
 pub use progenitor_client::{ByteStream, Error, ResponseValue};
 pub mod types {
     use serde::{Deserialize, Serialize};
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct EnrolBody {
         pub host: String,
         pub key: String,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct GlobalJobsResult {
         pub summary: Vec<ReportSummary>,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct OutputRecord {
         pub msg: String,
         pub stream: String,
         pub time: chrono::DateTime<chrono::offset::Utc>,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct PingResult {
         pub host: String,
         pub ok: bool,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct ReportFinishBody {
         pub duration_millis: i32,
         pub end_time: chrono::DateTime<chrono::offset::Utc>,
@@ -35,7 +35,7 @@ pub mod types {
         pub id: ReportId,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct ReportId {
         pub host: String,
         pub job: String,
@@ -44,25 +44,25 @@ pub mod types {
         pub uuid: String,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct ReportOutputBody {
         pub id: ReportId,
         pub record: OutputRecord,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct ReportResult {
         pub existed_already: bool,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct ReportStartBody {
         pub id: ReportId,
         pub script: String,
         pub start_time: chrono::DateTime<chrono::offset::Utc>,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct ReportSummary {
         pub age_seconds: i32,
         pub duration_seconds: i32,

progenitor-impl/tests/output/keeper-builder.out

@@ -3,31 +3,31 @@ use progenitor_client::{encode_path, RequestBuilderExt};
 pub use progenitor_client::{ByteStream, Error, ResponseValue};
 pub mod types {
     use serde::{Deserialize, Serialize};
-    #[derive(Serialize, Deserialize, Debug, Clone, JsonSchema)]
+    #[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
     pub struct EnrolBody {
         pub host: String,
         pub key: String,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone, JsonSchema)]
+    #[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
     pub struct GlobalJobsResult {
         pub summary: Vec<ReportSummary>,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone, JsonSchema)]
+    #[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
     pub struct OutputRecord {
         pub msg: String,
         pub stream: String,
         pub time: chrono::DateTime<chrono::offset::Utc>,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone, JsonSchema)]
+    #[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
     pub struct PingResult {
         pub host: String,
         pub ok: bool,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone, JsonSchema)]
+    #[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
     pub struct ReportFinishBody {
         pub duration_millis: i32,
         pub end_time: chrono::DateTime<chrono::offset::Utc>,
@@ -35,7 +35,7 @@ pub mod types {
         pub id: ReportId,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone, JsonSchema)]
+    #[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
     pub struct ReportId {
         pub host: String,
         pub job: String,
@@ -44,25 +44,25 @@ pub mod types {
         pub uuid: String,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone, JsonSchema)]
+    #[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
     pub struct ReportOutputBody {
         pub id: ReportId,
         pub record: OutputRecord,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone, JsonSchema)]
+    #[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
     pub struct ReportResult {
         pub existed_already: bool,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone, JsonSchema)]
+    #[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
     pub struct ReportStartBody {
         pub id: ReportId,
         pub script: String,
         pub start_time: chrono::DateTime<chrono::offset::Utc>,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone, JsonSchema)]
+    #[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
     pub struct ReportSummary {
         pub age_seconds: i32,
         pub duration_seconds: i32,

progenitor-impl/tests/output/keeper-positional.out

@@ -3,31 +3,31 @@ use progenitor_client::{encode_path, RequestBuilderExt};
 pub use progenitor_client::{ByteStream, Error, ResponseValue};
 pub mod types {
     use serde::{Deserialize, Serialize};
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct EnrolBody {
         pub host: String,
         pub key: String,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct GlobalJobsResult {
         pub summary: Vec<ReportSummary>,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct OutputRecord {
         pub msg: String,
         pub stream: String,
         pub time: chrono::DateTime<chrono::offset::Utc>,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct PingResult {
         pub host: String,
         pub ok: bool,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct ReportFinishBody {
         pub duration_millis: i32,
         pub end_time: chrono::DateTime<chrono::offset::Utc>,
@@ -35,7 +35,7 @@ pub mod types {
         pub id: ReportId,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct ReportId {
         pub host: String,
         pub job: String,
@@ -44,25 +44,25 @@ pub mod types {
         pub uuid: String,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct ReportOutputBody {
         pub id: ReportId,
         pub record: OutputRecord,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct ReportResult {
         pub existed_already: bool,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct ReportStartBody {
         pub id: ReportId,
         pub script: String,
         pub start_time: chrono::DateTime<chrono::offset::Utc>,
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct ReportSummary {
         pub age_seconds: i32,
         pub duration_seconds: i32,

progenitor-impl/tests/output/test_default_params.out

@@ -13,7 +13,7 @@ pub mod types {
         }
     }
 
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct BodyWithDefaults {
         #[serde(rename = "forty-two", default = "defaults::default_u64::<u32, 42>")]
         pub forty_two: u32,
@@ -23,7 +23,7 @@ pub mod types {
     }
 
     ///Error information from a response.
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct Error {
         #[serde(default, skip_serializing_if = "Option::is_none")]
         pub error_code: Option<String>,

progenitor-impl/tests/output/test_freeform_response.out

@@ -4,7 +4,7 @@ pub use progenitor_client::{ByteStream, Error, ResponseValue};
 pub mod types {
     use serde::{Deserialize, Serialize};
     ///Error information from a response.
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct Error {
         #[serde(default, skip_serializing_if = "Option::is_none")]
         pub error_code: Option<String>,

progenitor-impl/tests/output/test_renamed_parameters.out

@@ -4,7 +4,7 @@ pub use progenitor_client::{ByteStream, Error, ResponseValue};
 pub mod types {
     use serde::{Deserialize, Serialize};
     ///Error information from a response.
-    #[derive(Serialize, Deserialize, Debug, Clone)]
+    #[derive(Clone, Debug, Deserialize, Serialize)]
     pub struct Error {
         #[serde(default, skip_serializing_if = "Option::is_none")]
         pub error_code: Option<String>,

progenitor/Cargo.toml

@@ -20,6 +20,7 @@ clap = { version = "3.2.8", features = ["derive"] }
 chrono = { version = "0.4", features = ["serde"] }
 futures = "0.3.21"
 percent-encoding = "2.1"
+regress = "0.4.1"
 reqwest = { version = "0.11", features = ["json", "stream"] }
 schemars = { version = "0.8.10", features = ["uuid1"] }
 uuid = { version = "1.0", features = ["serde", "v4"] }

progenitor/tests/build_nexus.rs

@@ -12,9 +12,9 @@ mod positional {
     fn _ignore() {
         let _ = async {
             let client = Client::new("");
-            let org = types::Name("org".to_string());
+            let org = types::Name::try_from("org").unwrap();
-            let project = types::Name("project".to_string());
+            let project = types::Name::try_from("project").unwrap();
-            let instance = types::Name("instance".to_string());
+            let instance = types::Name::try_from("instance").unwrap();
             let stream = client.instance_disk_list_stream(
                 &org, &project, &instance, None, None,
             );
@@ -40,9 +40,9 @@ mod builder_untagged {
         let client = Client::new("");
         let stream = client
             .instance_disk_list()
-            .organization_name(types::Name("org".to_string()))
+            .organization_name(types::Name::try_from("org").unwrap())
-            .project_name(types::Name("project".to_string()))
+            .project_name(types::Name::try_from("project").unwrap())
-            .instance_name(types::Name("instance".to_string()))
+            .instance_name(types::Name::try_from("instance").unwrap())
             .stream();
         let _ = stream.collect::<Vec<_>>();
     }
@@ -65,9 +65,9 @@ mod builder_tagged {
         let client = Client::new("");
         let stream = client
             .instance_disk_list()
-            .organization_name(types::Name("org".to_string()))
+            .organization_name(types::Name::try_from("org").unwrap())
-            .project_name(types::Name("project".to_string()))
+            .project_name(types::Name::try_from("project").unwrap())
-            .instance_name(types::Name("instance".to_string()))
+            .instance_name(types::Name::try_from("instance").unwrap())
             .stream();
         let _ = stream.collect::<Vec<_>>();
     }

sample_openapi/nexus.json

@@ -7794,7 +7794,7 @@
         "title": "An IPv6 subnet",
         "description": "An IPv6 subnet, including prefix and subnet mask",
         "type": "string",
-        "pattern": "^(fd|FD)[0-9a-fA-F]{2}:((([0-9a-fA-F]{1,4}\\:){6}[0-9a-fA-F]{1,4})|(([0-9a-fA-F]{1,4}:){1,6}:))/(6[4-9]|[7-9][0-9]|1[0-1][0-9]|12[0-6])$",
+        "pattern": "^(fd|FD)[0-9a-fA-F]{2}:((([0-9a-fA-F]{1,4}:){6}[0-9a-fA-F]{1,4})|(([0-9a-fA-F]{1,4}:){1,6}:))/(6[4-9]|[7-9][0-9]|1[0-1][0-9]|12[0-6])$",
         "maxLength": 43
       },
       "Ipv6Range": {
@@ -10642,4 +10642,4 @@
       }
     }
   ]
-}
+}