Merge main, resolve conflicts

.github/buildomat/config.toml

@@ -0,0 +1,22 @@
+#
+# This file, with this flag, must be present in the default branch in order for
+# the buildomat integration to create check suites.
+#
+enable = true
+
+#
+# Require approval for pull requests made by users outside our organisation.
+#
+org_only = true
+
+#
+# We accept pull requests from several automated services that are outside the
+# organisation.  Allow jobs from those sources to proceed without manual
+# approval:
+#
+allow_users = [
+	"dependabot[bot]",
+	"oxide-reflector-bot[bot]",
+	"oxide-renovate[bot]",
+	"renovate[bot]",
+]

.github/workflows/rust.yml

@@ -60,3 +60,29 @@ jobs:
       run: cargo build --locked --tests --verbose
     - name: Run tests
       run: cargo test --locked --verbose
+
+  test-wasm:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - name: Install nightly
+      uses: actions-rs/toolchain@v1
+      with:
+        toolchain: nightly
+        components: rustfmt
+        default: false
+        target: wasm32-unknown-unknown
+    - uses: nanasess/setup-chromedriver@v2
+    - name: Install stable
+      uses: actions-rs/toolchain@v1
+      with:
+        toolchain: stable
+        components: rustfmt
+        default: true
+        target: wasm32-unknown-unknown
+    - name: Install wasm-bindgen-cli
+      run: cargo install --version 0.2.92 wasm-bindgen-cli
+    - name: Run tests
+      run: |
+        cd example-wasm
+        CHROMEDRIVER=$(which chromedriver) cargo test --target wasm32-unknown-unknown --locked --verbose

.gitignore

@@ -1 +1,3 @@
 target/
+
+progenitor-impl/tests/output/Cargo.lock

CHANGELOG.adoc

@@ -13,14 +13,56 @@
 
 == Unreleased changes (release date TBD)
 
-https://github.com/oxidecomputer/progenitor/compare/v0.2.0\...HEAD[Full list of commits]
+https://github.com/oxidecomputer/progenitor/compare/v0.6.0\...HEAD[Full list of commits]
+
+== 0.6.0 (released 2024-02-28)
+
+* Include payload in error when there's a deserialization failure (#655)
+* Conversion error type
+* Rustdoc for mods and extension traits (#677)
+* Ignore clippy in generated code (#702)
+
+https://github.com/oxidecomputer/progenitor/compare/v0.5.0\...v0.6.0[Full list of commits]
+
+== 0.5.0 (released 2023-12-16)
+
+* Improve breadth of schema support (#592)
+* Various changes to avoid name collisions (#599)
+* Support for text/plain and text/x-markdown body content types (#593)
+* Upgrade to `openapiv3` v2.0.0
+* Various type generation changes from `typify` 0.0.15
+
+https://github.com/oxidecomputer/progenitor/compare/v0.4.0\...v0.5.0[Full list of commits]
+
+== 0.4.1 (released 2023-12-15)
+
+* Fixed an issue with `openapiv3` and `indexmap` dependencies
+
+https://github.com/oxidecomputer/progenitor/compare/v0.4.0\...v0.4.1[Full list of commits]
+
+== 0.4.0 (released 2023-09-25)
+
+* Support for updated dropshot pagination extension (#465)
+* Many CLI and http mock generation improvements (beta)
+* Add cargo-progenitor (#476)
+
+https://github.com/oxidecomputer/progenitor/compare/v0.3.0\...v0.4.0[Full list of commits]
+
+== 0.3.0 (released 2023-05-03)
 
 * Add support for header parameters (#210)
 * Add support for YAML input (#227)
+* Add generation for `clap`-based CLIs
+* Add generation for strongly-typed mocks with `httpmock`
+* Remove dependency on rustfmt installations in macro and builder uses
+* Many improvements to type schema handling
+* Use of builder types for body parameters
+* Path-level parameter handling
+* Many options for augmenting type generation
 
-== 0.2.0 (released 2022-09-11)
+https://github.com/oxidecomputer/progenitor/compare/v0.2.0\...v0.3.0[Full list of commits]
 
-https://github.com/oxidecomputer/progenitor/compare/v0.1.1\...v0.2.0[Full list of commits]
+== 0.2.0 (released 2022-09-11)
 
 * Add support for a builder-style generation in addition to the positional style (#86)
 * Add support for body parameters with application/x-www-form-urlencoded media type (#109)
@@ -29,6 +71,8 @@ https://github.com/oxidecomputer/progenitor/compare/v0.1.1\...v0.2.0[Full list o
 * Add a prelude that include the `Client` and any extension traits (#176)
 * Add support for upgrading connections, which requires a version bump to reqwest. (#183)
 
+https://github.com/oxidecomputer/progenitor/compare/v0.1.1\...v0.2.0[Full list of commits]
+
 == 0.1.1 (released 2022-05-13)
 
 First published version