From fbe6c119032f8301d17f3cd833af588cee12bcf0 Mon Sep 17 00:00:00 2001
From: Richard Whitehouse <richard.whitehouse@metaswitch.com>
Date: Sat, 17 Aug 2024 07:17:36 +0100
Subject: [PATCH] [Rust] Ensure all features build as part of CI / Upgrade to
 Frunk 0.4 (#19364)

* [Rust] [CI] Build all features as part of CI

* [Rust Server] Update to frunk 0.4

* Update samples
---
 .github/workflows/samples-rust.yaml                    |  2 +-
 .../src/main/resources/rust-server/Cargo.mustache      | 10 +++++-----
 .../rust-server/output/multipart-v3/Cargo.toml         | 10 +++++-----
 .../rust-server/output/no-example-v3/Cargo.toml        | 10 +++++-----
 .../petstore/rust-server/output/openapi-v3/Cargo.toml  | 10 +++++-----
 .../petstore/rust-server/output/ops-v3/Cargo.toml      | 10 +++++-----
 .../Cargo.toml                                         | 10 +++++-----
 .../rust-server/output/ping-bearer-auth/Cargo.toml     | 10 +++++-----
 .../rust-server/output/rust-server-test/Cargo.toml     | 10 +++++-----
 9 files changed, 41 insertions(+), 41 deletions(-)

diff --git a/.github/workflows/samples-rust.yaml b/.github/workflows/samples-rust.yaml
index a19438cb50b..832ddf3e7e6 100644
--- a/.github/workflows/samples-rust.yaml
+++ b/.github/workflows/samples-rust.yaml
@@ -34,4 +34,4 @@ jobs:
           toolchain: stable
       - name: Build
         working-directory: ${{ matrix.sample }}
-        run: cargo build --all-targets
+        run: cargo build --all-targets --all-features
diff --git a/modules/openapi-generator/src/main/resources/rust-server/Cargo.mustache b/modules/openapi-generator/src/main/resources/rust-server/Cargo.mustache
index e03ac3f5b3b..8b050d77384 100644
--- a/modules/openapi-generator/src/main/resources/rust-server/Cargo.mustache
+++ b/modules/openapi-generator/src/main/resources/rust-server/Cargo.mustache
@@ -127,11 +127,11 @@ percent-encoding = {version = "2.1.0", optional = true}
 regex = {version = "1.3", optional = true}
 
 # Conversion
-frunk = { version = "0.3.0", optional = true }
-frunk_derives = { version = "0.3.0", optional = true }
-frunk_core = { version = "0.3.0", optional = true }
-frunk-enum-derive = { version = "0.2.0", optional = true }
-frunk-enum-core = { version = "0.2.0", optional = true }
+frunk = { version = "0.4.0", optional = true }
+frunk_derives = { version = "0.4.0", optional = true }
+frunk_core = { version = "0.4.0", optional = true }
+frunk-enum-derive = { version = "0.3.0", optional = true }
+frunk-enum-core = { version = "0.3.0", optional = true }
 
 # Bearer authentication
 jsonwebtoken = { version = "9.3.0", optional = false }
diff --git a/samples/server/petstore/rust-server/output/multipart-v3/Cargo.toml b/samples/server/petstore/rust-server/output/multipart-v3/Cargo.toml
index 38e6d825b77..c4fcb575a89 100644
--- a/samples/server/petstore/rust-server/output/multipart-v3/Cargo.toml
+++ b/samples/server/petstore/rust-server/output/multipart-v3/Cargo.toml
@@ -63,11 +63,11 @@ percent-encoding = {version = "2.1.0", optional = true}
 regex = {version = "1.3", optional = true}
 
 # Conversion
-frunk = { version = "0.3.0", optional = true }
-frunk_derives = { version = "0.3.0", optional = true }
-frunk_core = { version = "0.3.0", optional = true }
-frunk-enum-derive = { version = "0.2.0", optional = true }
-frunk-enum-core = { version = "0.2.0", optional = true }
+frunk = { version = "0.4.0", optional = true }
+frunk_derives = { version = "0.4.0", optional = true }
+frunk_core = { version = "0.4.0", optional = true }
+frunk-enum-derive = { version = "0.3.0", optional = true }
+frunk-enum-core = { version = "0.3.0", optional = true }
 
 # Bearer authentication
 jsonwebtoken = { version = "9.3.0", optional = false }
diff --git a/samples/server/petstore/rust-server/output/no-example-v3/Cargo.toml b/samples/server/petstore/rust-server/output/no-example-v3/Cargo.toml
index 3b708112b2f..293d8173ef3 100644
--- a/samples/server/petstore/rust-server/output/no-example-v3/Cargo.toml
+++ b/samples/server/petstore/rust-server/output/no-example-v3/Cargo.toml
@@ -53,11 +53,11 @@ percent-encoding = {version = "2.1.0", optional = true}
 regex = {version = "1.3", optional = true}
 
 # Conversion
-frunk = { version = "0.3.0", optional = true }
-frunk_derives = { version = "0.3.0", optional = true }
-frunk_core = { version = "0.3.0", optional = true }
-frunk-enum-derive = { version = "0.2.0", optional = true }
-frunk-enum-core = { version = "0.2.0", optional = true }
+frunk = { version = "0.4.0", optional = true }
+frunk_derives = { version = "0.4.0", optional = true }
+frunk_core = { version = "0.4.0", optional = true }
+frunk-enum-derive = { version = "0.3.0", optional = true }
+frunk-enum-core = { version = "0.3.0", optional = true }
 
 # Bearer authentication
 jsonwebtoken = { version = "9.3.0", optional = false }
diff --git a/samples/server/petstore/rust-server/output/openapi-v3/Cargo.toml b/samples/server/petstore/rust-server/output/openapi-v3/Cargo.toml
index 3dd0ee4d5f9..1a1a9949751 100644
--- a/samples/server/petstore/rust-server/output/openapi-v3/Cargo.toml
+++ b/samples/server/petstore/rust-server/output/openapi-v3/Cargo.toml
@@ -59,11 +59,11 @@ percent-encoding = {version = "2.1.0", optional = true}
 regex = {version = "1.3", optional = true}
 
 # Conversion
-frunk = { version = "0.3.0", optional = true }
-frunk_derives = { version = "0.3.0", optional = true }
-frunk_core = { version = "0.3.0", optional = true }
-frunk-enum-derive = { version = "0.2.0", optional = true }
-frunk-enum-core = { version = "0.2.0", optional = true }
+frunk = { version = "0.4.0", optional = true }
+frunk_derives = { version = "0.4.0", optional = true }
+frunk_core = { version = "0.4.0", optional = true }
+frunk-enum-derive = { version = "0.3.0", optional = true }
+frunk-enum-core = { version = "0.3.0", optional = true }
 
 # Bearer authentication
 jsonwebtoken = { version = "9.3.0", optional = false }
diff --git a/samples/server/petstore/rust-server/output/ops-v3/Cargo.toml b/samples/server/petstore/rust-server/output/ops-v3/Cargo.toml
index 10c46d9c2cd..1ccfe1a2c98 100644
--- a/samples/server/petstore/rust-server/output/ops-v3/Cargo.toml
+++ b/samples/server/petstore/rust-server/output/ops-v3/Cargo.toml
@@ -53,11 +53,11 @@ percent-encoding = {version = "2.1.0", optional = true}
 regex = {version = "1.3", optional = true}
 
 # Conversion
-frunk = { version = "0.3.0", optional = true }
-frunk_derives = { version = "0.3.0", optional = true }
-frunk_core = { version = "0.3.0", optional = true }
-frunk-enum-derive = { version = "0.2.0", optional = true }
-frunk-enum-core = { version = "0.2.0", optional = true }
+frunk = { version = "0.4.0", optional = true }
+frunk_derives = { version = "0.4.0", optional = true }
+frunk_core = { version = "0.4.0", optional = true }
+frunk-enum-derive = { version = "0.3.0", optional = true }
+frunk-enum-core = { version = "0.3.0", optional = true }
 
 # Bearer authentication
 jsonwebtoken = { version = "9.3.0", optional = false }
diff --git a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/Cargo.toml b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/Cargo.toml
index f26d4ca2528..2005c6c81d4 100644
--- a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/Cargo.toml
+++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/Cargo.toml
@@ -65,11 +65,11 @@ percent-encoding = {version = "2.1.0", optional = true}
 regex = {version = "1.3", optional = true}
 
 # Conversion
-frunk = { version = "0.3.0", optional = true }
-frunk_derives = { version = "0.3.0", optional = true }
-frunk_core = { version = "0.3.0", optional = true }
-frunk-enum-derive = { version = "0.2.0", optional = true }
-frunk-enum-core = { version = "0.2.0", optional = true }
+frunk = { version = "0.4.0", optional = true }
+frunk_derives = { version = "0.4.0", optional = true }
+frunk_core = { version = "0.4.0", optional = true }
+frunk-enum-derive = { version = "0.3.0", optional = true }
+frunk-enum-core = { version = "0.3.0", optional = true }
 
 # Bearer authentication
 jsonwebtoken = { version = "9.3.0", optional = false }
diff --git a/samples/server/petstore/rust-server/output/ping-bearer-auth/Cargo.toml b/samples/server/petstore/rust-server/output/ping-bearer-auth/Cargo.toml
index 3a6860128b4..b77567e316e 100644
--- a/samples/server/petstore/rust-server/output/ping-bearer-auth/Cargo.toml
+++ b/samples/server/petstore/rust-server/output/ping-bearer-auth/Cargo.toml
@@ -53,11 +53,11 @@ percent-encoding = {version = "2.1.0", optional = true}
 regex = {version = "1.3", optional = true}
 
 # Conversion
-frunk = { version = "0.3.0", optional = true }
-frunk_derives = { version = "0.3.0", optional = true }
-frunk_core = { version = "0.3.0", optional = true }
-frunk-enum-derive = { version = "0.2.0", optional = true }
-frunk-enum-core = { version = "0.2.0", optional = true }
+frunk = { version = "0.4.0", optional = true }
+frunk_derives = { version = "0.4.0", optional = true }
+frunk_core = { version = "0.4.0", optional = true }
+frunk-enum-derive = { version = "0.3.0", optional = true }
+frunk-enum-core = { version = "0.3.0", optional = true }
 
 # Bearer authentication
 jsonwebtoken = { version = "9.3.0", optional = false }
diff --git a/samples/server/petstore/rust-server/output/rust-server-test/Cargo.toml b/samples/server/petstore/rust-server/output/rust-server-test/Cargo.toml
index ef05cb141e3..50ef5c7d4bd 100644
--- a/samples/server/petstore/rust-server/output/rust-server-test/Cargo.toml
+++ b/samples/server/petstore/rust-server/output/rust-server-test/Cargo.toml
@@ -53,11 +53,11 @@ percent-encoding = {version = "2.1.0", optional = true}
 regex = {version = "1.3", optional = true}
 
 # Conversion
-frunk = { version = "0.3.0", optional = true }
-frunk_derives = { version = "0.3.0", optional = true }
-frunk_core = { version = "0.3.0", optional = true }
-frunk-enum-derive = { version = "0.2.0", optional = true }
-frunk-enum-core = { version = "0.2.0", optional = true }
+frunk = { version = "0.4.0", optional = true }
+frunk_derives = { version = "0.4.0", optional = true }
+frunk_core = { version = "0.4.0", optional = true }
+frunk-enum-derive = { version = "0.3.0", optional = true }
+frunk-enum-core = { version = "0.3.0", optional = true }
 
 # Bearer authentication
 jsonwebtoken = { version = "9.3.0", optional = false }