Rebuilt rust samples

ranger-ross · ranger-ross · commit 0bcfd678161f · 2024-10-22T19:25:29.000+09:00
diff --git a/docs/generators/rust.md b/docs/generators/rust.md
@@ -32,6 +32,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |supportMultipleResponses|If set, return type wraps an enum of all possible 2xx schemas. This option is for 'reqwest' and 'reqwest-trait' library only| |false|
 |supportTokenSource|If set, add support for google-cloud-token. This option is for 'reqwest' and 'reqwest-trait' library only and requires the 'supportAsync' option| |false|
 |topLevelApiClient|Creates a top level `Api` trait and `ApiClient` struct that contain all Apis. This option is for 'reqwest-trait' library only| |false|
+|useBonBuilder|Use the bon crate for building parameter types. This option is for the 'reqwest-trait' library only| |false|
 |useSingleRequestParameter|Setting this property to true will generate functions with a single argument containing all API endpoint parameters instead of one argument per parameter.| |false|
 |withAWSV4Signature|whether to include AWS v4 signature support| |false|
 
diff --git a/samples/client/others/rust/hyper/api-with-ref-param/Cargo.toml b/samples/client/others/rust/hyper/api-with-ref-param/Cargo.toml
@@ -19,5 +19,3 @@ http-body-util = { version = "0.1.2" }
 http = "~0.2"
 base64 = "~0.7.0"
 futures = "^0.3"
-
-[features]
diff --git a/samples/client/others/rust/hyper/composed-oneof/Cargo.toml b/samples/client/others/rust/hyper/composed-oneof/Cargo.toml
@@ -19,5 +19,3 @@ http-body-util = { version = "0.1.2" }
 http = "~0.2"
 base64 = "~0.7.0"
 futures = "^0.3"
-
-[features]
diff --git a/samples/client/others/rust/hyper/emptyObject/Cargo.toml b/samples/client/others/rust/hyper/emptyObject/Cargo.toml
@@ -19,5 +19,3 @@ http-body-util = { version = "0.1.2" }
 http = "~0.2"
 base64 = "~0.7.0"
 futures = "^0.3"
-
-[features]
diff --git a/samples/client/others/rust/hyper/oneOf-array-map/Cargo.toml b/samples/client/others/rust/hyper/oneOf-array-map/Cargo.toml
@@ -19,5 +19,3 @@ http-body-util = { version = "0.1.2" }
 http = "~0.2"
 base64 = "~0.7.0"
 futures = "^0.3"
-
-[features]
diff --git a/samples/client/others/rust/hyper/oneOf-reuseRef/Cargo.toml b/samples/client/others/rust/hyper/oneOf-reuseRef/Cargo.toml
@@ -18,5 +18,3 @@ http-body-util = { version = "0.1.2" }
 http = "~0.2"
 base64 = "~0.7.0"
 futures = "^0.3"
-
-[features]
diff --git a/samples/client/others/rust/hyper/oneOf/Cargo.toml b/samples/client/others/rust/hyper/oneOf/Cargo.toml
@@ -19,5 +19,3 @@ http-body-util = { version = "0.1.2" }
 http = "~0.2"
 base64 = "~0.7.0"
 futures = "^0.3"
-
-[features]
diff --git a/samples/client/others/rust/reqwest-regression-16119/Cargo.toml b/samples/client/others/rust/reqwest-regression-16119/Cargo.toml
@@ -14,5 +14,3 @@ serde_repr = "^0.1"
 url = "^2.5"
 uuid = { version = "^1.8", features = ["serde", "v4"] }
 reqwest = { version = "^0.12", features = ["json", "blocking", "multipart"] }
-
-[features]
diff --git a/samples/client/others/rust/reqwest/api-with-ref-param/Cargo.toml b/samples/client/others/rust/reqwest/api-with-ref-param/Cargo.toml
@@ -14,5 +14,3 @@ serde_repr = "^0.1"
 url = "^2.5"
 uuid = { version = "^1.8", features = ["serde", "v4"] }
 reqwest = { version = "^0.12", features = ["json", "multipart"] }
-
-[features]
diff --git a/samples/client/others/rust/reqwest/composed-oneof/Cargo.toml b/samples/client/others/rust/reqwest/composed-oneof/Cargo.toml
@@ -14,5 +14,3 @@ serde_repr = "^0.1"
 url = "^2.5"
 uuid = { version = "^1.8", features = ["serde", "v4"] }
 reqwest = { version = "^0.12", features = ["json", "blocking", "multipart"] }
-
-[features]
diff --git a/samples/client/others/rust/reqwest/emptyObject/Cargo.toml b/samples/client/others/rust/reqwest/emptyObject/Cargo.toml
@@ -14,5 +14,3 @@ serde_repr = "^0.1"
 url = "^2.5"
 uuid = { version = "^1.8", features = ["serde", "v4"] }
 reqwest = { version = "^0.12", features = ["json", "blocking", "multipart"] }
-
-[features]
diff --git a/samples/client/others/rust/reqwest/oneOf-array-map/Cargo.toml b/samples/client/others/rust/reqwest/oneOf-array-map/Cargo.toml
@@ -14,5 +14,3 @@ serde_repr = "^0.1"
 url = "^2.5"
 uuid = { version = "^1.8", features = ["serde", "v4"] }
 reqwest = { version = "^0.12", features = ["json", "blocking", "multipart"] }
-
-[features]
diff --git a/samples/client/others/rust/reqwest/oneOf-reuseRef/Cargo.toml b/samples/client/others/rust/reqwest/oneOf-reuseRef/Cargo.toml
@@ -13,5 +13,3 @@ serde_repr = "^0.1"
 url = "^2.5"
 uuid = { version = "^1.8", features = ["serde", "v4"] }
 reqwest = { version = "^0.12", features = ["json", "blocking", "multipart"] }
-
-[features]
diff --git a/samples/client/others/rust/reqwest/oneOf/Cargo.toml b/samples/client/others/rust/reqwest/oneOf/Cargo.toml
@@ -14,5 +14,3 @@ serde_repr = "^0.1"
 url = "^2.5"
 uuid = { version = "^1.8", features = ["serde", "v4"] }
 reqwest = { version = "^0.12", features = ["json", "blocking", "multipart"] }
-
-[features]
diff --git a/samples/client/petstore/rust/hyper/petstore/Cargo.toml b/samples/client/petstore/rust/hyper/petstore/Cargo.toml
@@ -19,5 +19,3 @@ http-body-util = { version = "0.1.2" }
 http = "~0.2"
 base64 = "~0.7.0"
 futures = "^0.3"
-
-[features]
diff --git a/samples/client/petstore/rust/hyper0x/petstore/Cargo.toml b/samples/client/petstore/rust/hyper0x/petstore/Cargo.toml
@@ -18,5 +18,3 @@ hyper-tls = "~0.5"
 http = "~0.2"
 base64 = "~0.7.0"
 futures = "^0.3"
-
-[features]
diff --git a/samples/client/petstore/rust/reqwest-trait/petstore/.openapi-generator/VERSION b/samples/client/petstore/rust/reqwest-trait/petstore/.openapi-generator/VERSION
@@ -1 +1 @@
-7.9.0-SNAPSHOT
+7.10.0-SNAPSHOT
diff --git a/samples/client/petstore/rust/reqwest-trait/petstore/Cargo.toml b/samples/client/petstore/rust/reqwest-trait/petstore/Cargo.toml
@@ -16,6 +16,5 @@ uuid = { version = "^1.8", features = ["serde", "v4"] }
 async-trait = "^0.1"
 reqwest = { version = "^0.12", features = ["json", "multipart"] }
 mockall = { version = "^0.13", optional = true}
-
 [features]
 mockall = ["dep:mockall"]
diff --git a/samples/client/petstore/rust/reqwest-trait/petstore/README.md b/samples/client/petstore/rust/reqwest-trait/petstore/README.md
@@ -9,7 +9,7 @@ This API client was generated by the [OpenAPI Generator](https://openapi-generat
 
 - API version: 1.0.0
 - Package version: 1.0.0
-- Generator version: 7.9.0-SNAPSHOT
+- Generator version: 7.10.0-SNAPSHOT
 - Build package: `org.openapitools.codegen.languages.RustClientCodegen`
 
 ## Installation
diff --git a/samples/client/petstore/rust/reqwest-trait/petstore/src/apis/fake_api.rs b/samples/client/petstore/rust/reqwest-trait/petstore/src/apis/fake_api.rs
@@ -34,6 +34,8 @@ impl FakeApiClient {
     }
 }
 
+
+
 #[async_trait]
 impl FakeApi for FakeApiClient {
     /// 
@@ -73,8 +75,6 @@ impl FakeApi for FakeApiClient {
 
 }
 
-
-
 /// struct for typed errors of method [`test_nullable_required_param`]
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(untagged)]
diff --git a/samples/client/petstore/rust/reqwest-trait/petstore/src/apis/pet_api.rs b/samples/client/petstore/rust/reqwest-trait/petstore/src/apis/pet_api.rs
@@ -41,6 +41,8 @@ impl PetApiClient {
     }
 }
 
+
+
 #[async_trait]
 impl PetApi for PetApiClient {
     /// 
@@ -325,8 +327,6 @@ impl PetApi for PetApiClient {
 
 }
 
-
-
 /// struct for typed errors of method [`add_pet`]
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(untagged)]
diff --git a/samples/client/petstore/rust/reqwest-trait/petstore/src/apis/store_api.rs b/samples/client/petstore/rust/reqwest-trait/petstore/src/apis/store_api.rs
@@ -37,6 +37,8 @@ impl StoreApiClient {
     }
 }
 
+
+
 #[async_trait]
 impl StoreApi for StoreApiClient {
     /// For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
@@ -162,8 +164,6 @@ impl StoreApi for StoreApiClient {
 
 }
 
-
-
 /// struct for typed errors of method [`delete_order`]
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(untagged)]
diff --git a/samples/client/petstore/rust/reqwest-trait/petstore/src/apis/testing_api.rs b/samples/client/petstore/rust/reqwest-trait/petstore/src/apis/testing_api.rs
@@ -35,6 +35,8 @@ impl TestingApiClient {
     }
 }
 
+
+
 #[async_trait]
 impl TestingApi for TestingApiClient {
     async fn tests_file_response_get<>(&self, ) -> Result<std::path::PathBuf, Error<TestsFileResponseGetError>> {
@@ -93,8 +95,6 @@ impl TestingApi for TestingApiClient {
 
 }
 
-
-
 /// struct for typed errors of method [`tests_file_response_get`]
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(untagged)]
diff --git a/samples/client/petstore/rust/reqwest-trait/petstore/src/apis/user_api.rs b/samples/client/petstore/rust/reqwest-trait/petstore/src/apis/user_api.rs
@@ -41,6 +41,8 @@ impl UserApiClient {
     }
 }
 
+
+
 #[async_trait]
 impl UserApi for UserApiClient {
     /// This can only be done by the logged in user.
@@ -323,8 +325,6 @@ impl UserApi for UserApiClient {
 
 }
 
-
-
 /// struct for typed errors of method [`create_user`]
 #[derive(Debug, Clone, Serialize, Deserialize)]
 #[serde(untagged)]
diff --git a/samples/client/petstore/rust/reqwest/name-mapping/Cargo.toml b/samples/client/petstore/rust/reqwest/name-mapping/Cargo.toml
@@ -13,5 +13,3 @@ serde_repr = "^0.1"
 url = "^2.5"
 uuid = { version = "^1.8", features = ["serde", "v4"] }
 reqwest = { version = "^0.12", features = ["json", "blocking", "multipart"] }
-
-[features]
diff --git a/samples/client/petstore/rust/reqwest/petstore-async-middleware/Cargo.toml b/samples/client/petstore/rust/reqwest/petstore-async-middleware/Cargo.toml
@@ -15,5 +15,3 @@ url = "^2.5"
 uuid = { version = "^1.8", features = ["serde", "v4"] }
 reqwest = { version = "^0.12", features = ["json", "multipart"] }
 reqwest-middleware = { version = "^0.3", features = ["json", "multipart"] }
-
-[features]
diff --git a/samples/client/petstore/rust/reqwest/petstore-async-tokensource/Cargo.toml b/samples/client/petstore/rust/reqwest/petstore-async-tokensource/Cargo.toml
@@ -17,5 +17,3 @@ reqwest = { version = "^0.12", features = ["json", "multipart"] }
 async-trait = "^0.1"
 # TODO: propose to Yoshidan to externalize this as non google related crate, so that it can easily be extended for other cloud providers.
 google-cloud-token = "^0.1"
-
-[features]
diff --git a/samples/client/petstore/rust/reqwest/petstore-async/Cargo.toml b/samples/client/petstore/rust/reqwest/petstore-async/Cargo.toml
@@ -14,5 +14,3 @@ serde_repr = "^0.1"
 url = "^2.5"
 uuid = { version = "^1.8", features = ["serde", "v4"] }
 reqwest = { version = "^0.12", features = ["json", "multipart"] }
-
-[features]
diff --git a/samples/client/petstore/rust/reqwest/petstore-avoid-box/Cargo.toml b/samples/client/petstore/rust/reqwest/petstore-avoid-box/Cargo.toml
@@ -14,5 +14,3 @@ serde_repr = "^0.1"
 url = "^2.5"
 uuid = { version = "^1.8", features = ["serde", "v4"] }
 reqwest = { version = "^0.12", features = ["json", "multipart"] }
-
-[features]
diff --git a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/Cargo.toml b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/Cargo.toml
@@ -17,5 +17,3 @@ aws-sigv4 = "0.3.0"
 http = "0.2.5"
 secrecy = "0.8.0"
 reqwest = { version = "^0.12", features = ["json", "blocking", "multipart"] }
-
-[features]
diff --git a/samples/client/petstore/rust/reqwest/petstore/Cargo.toml b/samples/client/petstore/rust/reqwest/petstore/Cargo.toml
@@ -14,5 +14,3 @@ serde_repr = "^0.1"
 url = "^2.5"
 uuid = { version = "^1.8", features = ["serde", "v4"] }
 reqwest = { version = "^0.12", features = ["json", "blocking", "multipart"] }
-
-[features]

Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,8 @@ impl FakeApiClient {`
`34`	`34`	`}`
`35`	`35`	`}`
`36`	`36`
	`37`	`+`
	`38`	`+`
`37`	`39`	`#[async_trait]`
`38`	`40`	`impl FakeApi for FakeApiClient {`
`39`	`41`	`///`
`@@ -73,8 +75,6 @@ impl FakeApi for FakeApiClient {`
`73`	`75`
`74`	`76`	`}`
`75`	`77`
`76`		`-`
`77`		`-`
`78`	`78`	/// struct for typed errors of method [`test_nullable_required_param`]
`79`	`79`	`#[derive(Debug, Clone, Serialize, Deserialize)]`
`80`	`80`	`#[serde(untagged)]`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,8 @@ impl PetApiClient {`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
	`44`	`+`
	`45`	`+`
`44`	`46`	`#[async_trait]`
`45`	`47`	`impl PetApi for PetApiClient {`
`46`	`48`	`///`
`@@ -325,8 +327,6 @@ impl PetApi for PetApiClient {`
`325`	`327`
`326`	`328`	`}`
`327`	`329`
`328`		`-`
`329`		`-`
`330`	`330`	/// struct for typed errors of method [`add_pet`]
`331`	`331`	`#[derive(Debug, Clone, Serialize, Deserialize)]`
`332`	`332`	`#[serde(untagged)]`
Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,8 @@ impl StoreApiClient {`
`37`	`37`	`}`
`38`	`38`	`}`
`39`	`39`
	`40`	`+`
	`41`	`+`
`40`	`42`	`#[async_trait]`
`41`	`43`	`impl StoreApi for StoreApiClient {`
`42`	`44`	`/// For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors`
`@@ -162,8 +164,6 @@ impl StoreApi for StoreApiClient {`
`162`	`164`
`163`	`165`	`}`
`164`	`166`
`165`		`-`
`166`		`-`
`167`	`167`	/// struct for typed errors of method [`delete_order`]
`168`	`168`	`#[derive(Debug, Clone, Serialize, Deserialize)]`
`169`	`169`	`#[serde(untagged)]`
Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,8 @@ impl TestingApiClient {`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`
	`38`	`+`
	`39`	`+`
`38`	`40`	`#[async_trait]`
`39`	`41`	`impl TestingApi for TestingApiClient {`
`40`	`42`	`async fn tests_file_response_get<>(&self, ) -> Result<std::path::PathBuf, Error<TestsFileResponseGetError>> {`
`@@ -93,8 +95,6 @@ impl TestingApi for TestingApiClient {`
`93`	`95`
`94`	`96`	`}`
`95`	`97`
`96`		`-`
`97`		`-`
`98`	`98`	/// struct for typed errors of method [`tests_file_response_get`]
`99`	`99`	`#[derive(Debug, Clone, Serialize, Deserialize)]`
`100`	`100`	`#[serde(untagged)]`
Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,8 @@ impl UserApiClient {`
`41`	`41`	`}`
`42`	`42`	`}`
`43`	`43`
	`44`	`+`
	`45`	`+`
`44`	`46`	`#[async_trait]`
`45`	`47`	`impl UserApi for UserApiClient {`
`46`	`48`	`/// This can only be done by the logged in user.`
`@@ -323,8 +325,6 @@ impl UserApi for UserApiClient {`
`323`	`325`
`324`	`326`	`}`
`325`	`327`
`326`		`-`
`327`		`-`
`328`	`328`	/// struct for typed errors of method [`create_user`]
`329`	`329`	`#[derive(Debug, Clone, Serialize, Deserialize)]`
`330`	`330`	`#[serde(untagged)]`