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 794a5f8be6b..806211893fe 100644 --- a/modules/openapi-generator/src/main/resources/rust-server/Cargo.mustache +++ b/modules/openapi-generator/src/main/resources/rust-server/Cargo.mustache @@ -17,7 +17,7 @@ license = "{{.}}" # Override this license by providing a License Object in the OpenAPI. license = "Unlicense" {{/licenseInfo}} -edition = "2018" +edition = "2021" {{#publishRustRegistry}} publish = ["{{.}}"] {{/publishRustRegistry}} diff --git a/modules/openapi-generator/src/main/resources/rust/Cargo.mustache b/modules/openapi-generator/src/main/resources/rust/Cargo.mustache index d6fa2e3efcb..7b4e15d2505 100644 --- a/modules/openapi-generator/src/main/resources/rust/Cargo.mustache +++ b/modules/openapi-generator/src/main/resources/rust/Cargo.mustache @@ -17,7 +17,7 @@ license = "{{.}}" # Override this license by providing a License Object in the OpenAPI. license = "Unlicense" {{/licenseInfo}} -edition = "2018" +edition = "2021" {{#publishRustRegistry}} publish = ["{{.}}"] {{/publishRustRegistry}} @@ -32,14 +32,13 @@ homepage = "{{.}} {{/homePageUrl}} [dependencies] -serde = "^1.0" -serde_derive = "^1.0" +serde = { version = "^1.0", features = ["derive"] } {{#serdeWith}} -serde_with = { version = "^3", default-features = false, features = ["base64", "std", "macros"] } +serde_with = { version = "^3.8", default-features = false, features = ["base64", "std", "macros"] } {{/serdeWith}} serde_json = "^1.0" -url = "^2.2" -uuid = { version = "^1.0", features = ["serde", "v4"] } +url = "^2.5" +uuid = { version = "^1.8", features = ["serde", "v4"] } {{#hyper}} hyper = { version = "~0.14", features = ["full"] } hyper-tls = "~0.5" @@ -54,16 +53,15 @@ secrecy = "0.8.0" {{/withAWSV4Signature}} {{#reqwest}} {{^supportAsync}} -[dependencies.reqwest] -version = "^0.11" -features = ["json", "blocking", "multipart"] +reqwest = { version = "^0.12", features = ["json", "blocking", "multipart"] } +{{#supportMiddleware}} +reqwest-middleware = { version = "^0.3", features = ["json", "blocking", "multipart"] } +{{/supportMiddleware}} {{/supportAsync}} {{#supportAsync}} +reqwest = { version = "^0.12", features = ["json", "multipart"] } {{#supportMiddleware}} -reqwest-middleware = "0.2.0" +reqwest-middleware = { version = "^0.3", features = ["json", "multipart"] } {{/supportMiddleware}} -[dependencies.reqwest] -version = "^0.11" -features = ["json", "multipart"] {{/supportAsync}} {{/reqwest}} diff --git a/modules/openapi-generator/src/main/resources/rust/hyper/api_mod.mustache b/modules/openapi-generator/src/main/resources/rust/hyper/api_mod.mustache index 8314cb60b07..51a42ef361a 100644 --- a/modules/openapi-generator/src/main/resources/rust/hyper/api_mod.mustache +++ b/modules/openapi-generator/src/main/resources/rust/hyper/api_mod.mustache @@ -29,19 +29,19 @@ impl From<(hyper::StatusCode, hyper::body::Body)> for Error { impl From for Error { fn from(e: http::Error) -> Self { - return Error::Http(e) + Error::Http(e) } } impl From for Error { fn from(e: hyper::Error) -> Self { - return Error::Hyper(e) + Error::Hyper(e) } } impl From for Error { fn from(e: serde_json::Error) -> Self { - return Error::Serde(e) + Error::Serde(e) } } diff --git a/modules/openapi-generator/src/main/resources/rust/lib.mustache b/modules/openapi-generator/src/main/resources/rust/lib.mustache index c9f5913ae81..276ad12cfbb 100644 --- a/modules/openapi-generator/src/main/resources/rust/lib.mustache +++ b/modules/openapi-generator/src/main/resources/rust/lib.mustache @@ -1,9 +1,6 @@ #![allow(unused_imports)] #![allow(clippy::too_many_arguments)] -#[macro_use] -extern crate serde_derive; - extern crate serde; extern crate serde_json; extern crate url; diff --git a/modules/openapi-generator/src/main/resources/rust/model.mustache b/modules/openapi-generator/src/main/resources/rust/model.mustache index 7c2c1bcd008..94fcdf097ea 100644 --- a/modules/openapi-generator/src/main/resources/rust/model.mustache +++ b/modules/openapi-generator/src/main/resources/rust/model.mustache @@ -1,5 +1,6 @@ {{>partial_header}} use crate::models; +use serde::{Deserialize, Serialize}; {{#models}} {{#model}} {{^isEnum}}{{#vendorExtensions.x-rust-has-byte-array}} diff --git a/modules/openapi-generator/src/main/resources/rust/reqwest/api.mustache b/modules/openapi-generator/src/main/resources/rust/reqwest/api.mustache index 23c6300f99b..f9e6e9db599 100644 --- a/modules/openapi-generator/src/main/resources/rust/reqwest/api.mustache +++ b/modules/openapi-generator/src/main/resources/rust/reqwest/api.mustache @@ -1,7 +1,7 @@ {{>partial_header}} use reqwest; - +use serde::{Deserialize, Serialize}; use crate::{apis::ResponseContent, models}; use super::{Error, configuration}; @@ -174,7 +174,7 @@ pub {{#supportAsync}}async {{/supportAsync}}fn {{{operationId}}}(configuration: {{/bodyParams}} {{/hasBodyParam}} {{^hasBodyParam}} - &"", + "", {{/hasBodyParam}} ) { Ok(new_headers) => new_headers, diff --git a/modules/openapi-generator/src/main/resources/rust/reqwest/configuration.mustache b/modules/openapi-generator/src/main/resources/rust/reqwest/configuration.mustache index 0de2884a8bb..fd6f7d052d9 100644 --- a/modules/openapi-generator/src/main/resources/rust/reqwest/configuration.mustache +++ b/modules/openapi-generator/src/main/resources/rust/reqwest/configuration.mustache @@ -64,7 +64,7 @@ impl AWSv4Key { value.to_str().expect("header value should be a string").to_string())); } } - return Ok(additional_headers); + Ok(additional_headers) } } {{/withAWSV4Signature}} diff --git a/samples/client/others/rust/Cargo.toml b/samples/client/others/rust/Cargo.toml index 85fad3af177..d36e0a12fec 100644 --- a/samples/client/others/rust/Cargo.toml +++ b/samples/client/others/rust/Cargo.toml @@ -1,2 +1,3 @@ [workspace] members = ["hyper/*", "reqwest/*", "reqwest-regression-16119"] +resolver = "2" 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 index 78dd6778b99..bbf7d006f49 100644 --- a/samples/client/others/rust/hyper/api-with-ref-param/Cargo.toml +++ b/samples/client/others/rust/hyper/api-with-ref-param/Cargo.toml @@ -5,14 +5,13 @@ authors = ["OpenAPI Generator team and contributors"] description = "No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)" # Override this license by providing a License Object in the OpenAPI. license = "Unlicense" -edition = "2018" +edition = "2021" [dependencies] -serde = "^1.0" -serde_derive = "^1.0" +serde = { version = "^1.0", features = ["derive"] } serde_json = "^1.0" -url = "^2.2" -uuid = { version = "^1.0", features = ["serde", "v4"] } +url = "^2.5" +uuid = { version = "^1.8", features = ["serde", "v4"] } hyper = { version = "~0.14", features = ["full"] } hyper-tls = "~0.5" http = "~0.2" diff --git a/samples/client/others/rust/hyper/api-with-ref-param/src/apis/mod.rs b/samples/client/others/rust/hyper/api-with-ref-param/src/apis/mod.rs index 1a5b2f58e4b..4d85ccfc475 100644 --- a/samples/client/others/rust/hyper/api-with-ref-param/src/apis/mod.rs +++ b/samples/client/others/rust/hyper/api-with-ref-param/src/apis/mod.rs @@ -29,19 +29,19 @@ impl From<(hyper::StatusCode, hyper::body::Body)> for Error { impl From for Error { fn from(e: http::Error) -> Self { - return Error::Http(e) + Error::Http(e) } } impl From for Error { fn from(e: hyper::Error) -> Self { - return Error::Hyper(e) + Error::Hyper(e) } } impl From for Error { fn from(e: serde_json::Error) -> Self { - return Error::Serde(e) + Error::Serde(e) } } diff --git a/samples/client/others/rust/hyper/api-with-ref-param/src/lib.rs b/samples/client/others/rust/hyper/api-with-ref-param/src/lib.rs index 290e1b7b927..1de74d07cff 100644 --- a/samples/client/others/rust/hyper/api-with-ref-param/src/lib.rs +++ b/samples/client/others/rust/hyper/api-with-ref-param/src/lib.rs @@ -1,9 +1,6 @@ #![allow(unused_imports)] #![allow(clippy::too_many_arguments)] -#[macro_use] -extern crate serde_derive; - extern crate serde; extern crate serde_json; extern crate url; diff --git a/samples/client/others/rust/hyper/api-with-ref-param/src/models/color.rs b/samples/client/others/rust/hyper/api-with-ref-param/src/models/color.rs index b5df438c652..26b274a562e 100644 --- a/samples/client/others/rust/hyper/api-with-ref-param/src/models/color.rs +++ b/samples/client/others/rust/hyper/api-with-ref-param/src/models/color.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// #[derive(Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize, Deserialize)] diff --git a/samples/client/others/rust/hyper/composed-oneof/Cargo.toml b/samples/client/others/rust/hyper/composed-oneof/Cargo.toml index 0f8feed80f4..c91777db137 100644 --- a/samples/client/others/rust/hyper/composed-oneof/Cargo.toml +++ b/samples/client/others/rust/hyper/composed-oneof/Cargo.toml @@ -5,14 +5,13 @@ authors = ["OpenAPI Generator team and contributors"] description = "No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)" # Override this license by providing a License Object in the OpenAPI. license = "Unlicense" -edition = "2018" +edition = "2021" [dependencies] -serde = "^1.0" -serde_derive = "^1.0" +serde = { version = "^1.0", features = ["derive"] } serde_json = "^1.0" -url = "^2.2" -uuid = { version = "^1.0", features = ["serde", "v4"] } +url = "^2.5" +uuid = { version = "^1.8", features = ["serde", "v4"] } hyper = { version = "~0.14", features = ["full"] } hyper-tls = "~0.5" http = "~0.2" diff --git a/samples/client/others/rust/hyper/composed-oneof/src/apis/mod.rs b/samples/client/others/rust/hyper/composed-oneof/src/apis/mod.rs index 1a5b2f58e4b..4d85ccfc475 100644 --- a/samples/client/others/rust/hyper/composed-oneof/src/apis/mod.rs +++ b/samples/client/others/rust/hyper/composed-oneof/src/apis/mod.rs @@ -29,19 +29,19 @@ impl From<(hyper::StatusCode, hyper::body::Body)> for Error { impl From for Error { fn from(e: http::Error) -> Self { - return Error::Http(e) + Error::Http(e) } } impl From for Error { fn from(e: hyper::Error) -> Self { - return Error::Hyper(e) + Error::Hyper(e) } } impl From for Error { fn from(e: serde_json::Error) -> Self { - return Error::Serde(e) + Error::Serde(e) } } diff --git a/samples/client/others/rust/hyper/composed-oneof/src/lib.rs b/samples/client/others/rust/hyper/composed-oneof/src/lib.rs index 290e1b7b927..1de74d07cff 100644 --- a/samples/client/others/rust/hyper/composed-oneof/src/lib.rs +++ b/samples/client/others/rust/hyper/composed-oneof/src/lib.rs @@ -1,9 +1,6 @@ #![allow(unused_imports)] #![allow(clippy::too_many_arguments)] -#[macro_use] -extern crate serde_derive; - extern crate serde; extern crate serde_json; extern crate url; diff --git a/samples/client/others/rust/hyper/composed-oneof/src/models/create_state_request.rs b/samples/client/others/rust/hyper/composed-oneof/src/models/create_state_request.rs index a3ba90fcded..7e3701b8c96 100644 --- a/samples/client/others/rust/hyper/composed-oneof/src/models/create_state_request.rs +++ b/samples/client/others/rust/hyper/composed-oneof/src/models/create_state_request.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] #[serde(tag = "realtype")] diff --git a/samples/client/others/rust/hyper/composed-oneof/src/models/custom_one_of_array_schema_inner.rs b/samples/client/others/rust/hyper/composed-oneof/src/models/custom_one_of_array_schema_inner.rs index afff7fb23a6..2b3c27f0d4e 100644 --- a/samples/client/others/rust/hyper/composed-oneof/src/models/custom_one_of_array_schema_inner.rs +++ b/samples/client/others/rust/hyper/composed-oneof/src/models/custom_one_of_array_schema_inner.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] #[serde(tag = "realtype")] diff --git a/samples/client/others/rust/hyper/composed-oneof/src/models/custom_one_of_schema.rs b/samples/client/others/rust/hyper/composed-oneof/src/models/custom_one_of_schema.rs index 1b1f60a3ffd..c4f53db183d 100644 --- a/samples/client/others/rust/hyper/composed-oneof/src/models/custom_one_of_schema.rs +++ b/samples/client/others/rust/hyper/composed-oneof/src/models/custom_one_of_schema.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] #[serde(tag = "realtype")] diff --git a/samples/client/others/rust/hyper/composed-oneof/src/models/get_state_200_response.rs b/samples/client/others/rust/hyper/composed-oneof/src/models/get_state_200_response.rs index aaa86cbafbb..aeee0c377e4 100644 --- a/samples/client/others/rust/hyper/composed-oneof/src/models/get_state_200_response.rs +++ b/samples/client/others/rust/hyper/composed-oneof/src/models/get_state_200_response.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] #[serde(tag = "realtype")] diff --git a/samples/client/others/rust/hyper/composed-oneof/src/models/obj_a.rs b/samples/client/others/rust/hyper/composed-oneof/src/models/obj_a.rs index 67e72b00fed..0d581be15d9 100644 --- a/samples/client/others/rust/hyper/composed-oneof/src/models/obj_a.rs +++ b/samples/client/others/rust/hyper/composed-oneof/src/models/obj_a.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ObjA { diff --git a/samples/client/others/rust/hyper/composed-oneof/src/models/obj_b.rs b/samples/client/others/rust/hyper/composed-oneof/src/models/obj_b.rs index 835695c7661..d0c508338d8 100644 --- a/samples/client/others/rust/hyper/composed-oneof/src/models/obj_b.rs +++ b/samples/client/others/rust/hyper/composed-oneof/src/models/obj_b.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ObjB { diff --git a/samples/client/others/rust/hyper/composed-oneof/src/models/obj_c.rs b/samples/client/others/rust/hyper/composed-oneof/src/models/obj_c.rs index abc6aae2487..df21df238a3 100644 --- a/samples/client/others/rust/hyper/composed-oneof/src/models/obj_c.rs +++ b/samples/client/others/rust/hyper/composed-oneof/src/models/obj_c.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ObjC { diff --git a/samples/client/others/rust/hyper/composed-oneof/src/models/obj_d.rs b/samples/client/others/rust/hyper/composed-oneof/src/models/obj_d.rs index 287c2f24e3e..37640c7b418 100644 --- a/samples/client/others/rust/hyper/composed-oneof/src/models/obj_d.rs +++ b/samples/client/others/rust/hyper/composed-oneof/src/models/obj_d.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ObjD { diff --git a/samples/client/others/rust/hyper/emptyObject/Cargo.toml b/samples/client/others/rust/hyper/emptyObject/Cargo.toml index 3574a9d4a89..7e570fe7056 100644 --- a/samples/client/others/rust/hyper/emptyObject/Cargo.toml +++ b/samples/client/others/rust/hyper/emptyObject/Cargo.toml @@ -5,14 +5,13 @@ authors = ["OpenAPI Generator team and contributors"] description = "Ensure rust supports empty objects using serde::Value" # Override this license by providing a License Object in the OpenAPI. license = "Unlicense" -edition = "2018" +edition = "2021" [dependencies] -serde = "^1.0" -serde_derive = "^1.0" +serde = { version = "^1.0", features = ["derive"] } serde_json = "^1.0" -url = "^2.2" -uuid = { version = "^1.0", features = ["serde", "v4"] } +url = "^2.5" +uuid = { version = "^1.8", features = ["serde", "v4"] } hyper = { version = "~0.14", features = ["full"] } hyper-tls = "~0.5" http = "~0.2" diff --git a/samples/client/others/rust/hyper/emptyObject/src/apis/mod.rs b/samples/client/others/rust/hyper/emptyObject/src/apis/mod.rs index 1a5b2f58e4b..4d85ccfc475 100644 --- a/samples/client/others/rust/hyper/emptyObject/src/apis/mod.rs +++ b/samples/client/others/rust/hyper/emptyObject/src/apis/mod.rs @@ -29,19 +29,19 @@ impl From<(hyper::StatusCode, hyper::body::Body)> for Error { impl From for Error { fn from(e: http::Error) -> Self { - return Error::Http(e) + Error::Http(e) } } impl From for Error { fn from(e: hyper::Error) -> Self { - return Error::Hyper(e) + Error::Hyper(e) } } impl From for Error { fn from(e: serde_json::Error) -> Self { - return Error::Serde(e) + Error::Serde(e) } } diff --git a/samples/client/others/rust/hyper/emptyObject/src/lib.rs b/samples/client/others/rust/hyper/emptyObject/src/lib.rs index 290e1b7b927..1de74d07cff 100644 --- a/samples/client/others/rust/hyper/emptyObject/src/lib.rs +++ b/samples/client/others/rust/hyper/emptyObject/src/lib.rs @@ -1,9 +1,6 @@ #![allow(unused_imports)] #![allow(clippy::too_many_arguments)] -#[macro_use] -extern crate serde_derive; - extern crate serde; extern crate serde_json; extern crate url; diff --git a/samples/client/others/rust/hyper/emptyObject/src/models/empty_object.rs b/samples/client/others/rust/hyper/emptyObject/src/models/empty_object.rs index 6db5fbff7ad..ed5bffc2d37 100644 --- a/samples/client/others/rust/hyper/emptyObject/src/models/empty_object.rs +++ b/samples/client/others/rust/hyper/emptyObject/src/models/empty_object.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct EmptyObject { diff --git a/samples/client/others/rust/hyper/oneOf-array-map/Cargo.toml b/samples/client/others/rust/hyper/oneOf-array-map/Cargo.toml index 9b6c6d0bed3..7e1c7960f6d 100644 --- a/samples/client/others/rust/hyper/oneOf-array-map/Cargo.toml +++ b/samples/client/others/rust/hyper/oneOf-array-map/Cargo.toml @@ -5,14 +5,13 @@ authors = ["OpenAPI Generator team and contributors"] description = "No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)" # Override this license by providing a License Object in the OpenAPI. license = "Unlicense" -edition = "2018" +edition = "2021" [dependencies] -serde = "^1.0" -serde_derive = "^1.0" +serde = { version = "^1.0", features = ["derive"] } serde_json = "^1.0" -url = "^2.2" -uuid = { version = "^1.0", features = ["serde", "v4"] } +url = "^2.5" +uuid = { version = "^1.8", features = ["serde", "v4"] } hyper = { version = "~0.14", features = ["full"] } hyper-tls = "~0.5" http = "~0.2" diff --git a/samples/client/others/rust/hyper/oneOf-array-map/src/apis/mod.rs b/samples/client/others/rust/hyper/oneOf-array-map/src/apis/mod.rs index 1a5b2f58e4b..4d85ccfc475 100644 --- a/samples/client/others/rust/hyper/oneOf-array-map/src/apis/mod.rs +++ b/samples/client/others/rust/hyper/oneOf-array-map/src/apis/mod.rs @@ -29,19 +29,19 @@ impl From<(hyper::StatusCode, hyper::body::Body)> for Error { impl From for Error { fn from(e: http::Error) -> Self { - return Error::Http(e) + Error::Http(e) } } impl From for Error { fn from(e: hyper::Error) -> Self { - return Error::Hyper(e) + Error::Hyper(e) } } impl From for Error { fn from(e: serde_json::Error) -> Self { - return Error::Serde(e) + Error::Serde(e) } } diff --git a/samples/client/others/rust/hyper/oneOf-array-map/src/lib.rs b/samples/client/others/rust/hyper/oneOf-array-map/src/lib.rs index 290e1b7b927..1de74d07cff 100644 --- a/samples/client/others/rust/hyper/oneOf-array-map/src/lib.rs +++ b/samples/client/others/rust/hyper/oneOf-array-map/src/lib.rs @@ -1,9 +1,6 @@ #![allow(unused_imports)] #![allow(clippy::too_many_arguments)] -#[macro_use] -extern crate serde_derive; - extern crate serde; extern crate serde_json; extern crate url; diff --git a/samples/client/others/rust/hyper/oneOf-array-map/src/models/apple.rs b/samples/client/others/rust/hyper/oneOf-array-map/src/models/apple.rs index 8472b2a8e5a..a9f47c5e029 100644 --- a/samples/client/others/rust/hyper/oneOf-array-map/src/models/apple.rs +++ b/samples/client/others/rust/hyper/oneOf-array-map/src/models/apple.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct Apple { diff --git a/samples/client/others/rust/hyper/oneOf-array-map/src/models/fruit.rs b/samples/client/others/rust/hyper/oneOf-array-map/src/models/fruit.rs index 3bf995add30..827f9e47063 100644 --- a/samples/client/others/rust/hyper/oneOf-array-map/src/models/fruit.rs +++ b/samples/client/others/rust/hyper/oneOf-array-map/src/models/fruit.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] #[serde(untagged)] diff --git a/samples/client/others/rust/hyper/oneOf-array-map/src/models/grape.rs b/samples/client/others/rust/hyper/oneOf-array-map/src/models/grape.rs index bc7d12681c4..50b1144cd1d 100644 --- a/samples/client/others/rust/hyper/oneOf-array-map/src/models/grape.rs +++ b/samples/client/others/rust/hyper/oneOf-array-map/src/models/grape.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct Grape { diff --git a/samples/client/others/rust/hyper/oneOf-reuseRef/Cargo.toml b/samples/client/others/rust/hyper/oneOf-reuseRef/Cargo.toml index 60cde076e1b..6ff45ef734e 100644 --- a/samples/client/others/rust/hyper/oneOf-reuseRef/Cargo.toml +++ b/samples/client/others/rust/hyper/oneOf-reuseRef/Cargo.toml @@ -4,14 +4,13 @@ version = "1.0.0" authors = ["OpenAPI Generator team and contributors"] description = "No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)" license = "MIT" -edition = "2018" +edition = "2021" [dependencies] -serde = "^1.0" -serde_derive = "^1.0" +serde = { version = "^1.0", features = ["derive"] } serde_json = "^1.0" -url = "^2.2" -uuid = { version = "^1.0", features = ["serde", "v4"] } +url = "^2.5" +uuid = { version = "^1.8", features = ["serde", "v4"] } hyper = { version = "~0.14", features = ["full"] } hyper-tls = "~0.5" http = "~0.2" diff --git a/samples/client/others/rust/hyper/oneOf-reuseRef/src/apis/mod.rs b/samples/client/others/rust/hyper/oneOf-reuseRef/src/apis/mod.rs index 1a5b2f58e4b..4d85ccfc475 100644 --- a/samples/client/others/rust/hyper/oneOf-reuseRef/src/apis/mod.rs +++ b/samples/client/others/rust/hyper/oneOf-reuseRef/src/apis/mod.rs @@ -29,19 +29,19 @@ impl From<(hyper::StatusCode, hyper::body::Body)> for Error { impl From for Error { fn from(e: http::Error) -> Self { - return Error::Http(e) + Error::Http(e) } } impl From for Error { fn from(e: hyper::Error) -> Self { - return Error::Hyper(e) + Error::Hyper(e) } } impl From for Error { fn from(e: serde_json::Error) -> Self { - return Error::Serde(e) + Error::Serde(e) } } diff --git a/samples/client/others/rust/hyper/oneOf-reuseRef/src/lib.rs b/samples/client/others/rust/hyper/oneOf-reuseRef/src/lib.rs index 290e1b7b927..1de74d07cff 100644 --- a/samples/client/others/rust/hyper/oneOf-reuseRef/src/lib.rs +++ b/samples/client/others/rust/hyper/oneOf-reuseRef/src/lib.rs @@ -1,9 +1,6 @@ #![allow(unused_imports)] #![allow(clippy::too_many_arguments)] -#[macro_use] -extern crate serde_derive; - extern crate serde; extern crate serde_json; extern crate url; diff --git a/samples/client/others/rust/hyper/oneOf-reuseRef/src/models/apple.rs b/samples/client/others/rust/hyper/oneOf-reuseRef/src/models/apple.rs index 72586e60471..6a7c03c3bc1 100644 --- a/samples/client/others/rust/hyper/oneOf-reuseRef/src/models/apple.rs +++ b/samples/client/others/rust/hyper/oneOf-reuseRef/src/models/apple.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct Apple { diff --git a/samples/client/others/rust/hyper/oneOf-reuseRef/src/models/banana.rs b/samples/client/others/rust/hyper/oneOf-reuseRef/src/models/banana.rs index b3dfb65a245..a80f3d23e0f 100644 --- a/samples/client/others/rust/hyper/oneOf-reuseRef/src/models/banana.rs +++ b/samples/client/others/rust/hyper/oneOf-reuseRef/src/models/banana.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct Banana { diff --git a/samples/client/others/rust/hyper/oneOf-reuseRef/src/models/fruit.rs b/samples/client/others/rust/hyper/oneOf-reuseRef/src/models/fruit.rs index e1b018e8411..cd28f15520c 100644 --- a/samples/client/others/rust/hyper/oneOf-reuseRef/src/models/fruit.rs +++ b/samples/client/others/rust/hyper/oneOf-reuseRef/src/models/fruit.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] #[serde(tag = "fruitType")] diff --git a/samples/client/others/rust/hyper/oneOf/Cargo.toml b/samples/client/others/rust/hyper/oneOf/Cargo.toml index 0209137ee82..647e2769394 100644 --- a/samples/client/others/rust/hyper/oneOf/Cargo.toml +++ b/samples/client/others/rust/hyper/oneOf/Cargo.toml @@ -5,14 +5,13 @@ authors = ["OpenAPI Generator team and contributors"] description = "This tests for a oneOf interface representation " # Override this license by providing a License Object in the OpenAPI. license = "Unlicense" -edition = "2018" +edition = "2021" [dependencies] -serde = "^1.0" -serde_derive = "^1.0" +serde = { version = "^1.0", features = ["derive"] } serde_json = "^1.0" -url = "^2.2" -uuid = { version = "^1.0", features = ["serde", "v4"] } +url = "^2.5" +uuid = { version = "^1.8", features = ["serde", "v4"] } hyper = { version = "~0.14", features = ["full"] } hyper-tls = "~0.5" http = "~0.2" diff --git a/samples/client/others/rust/hyper/oneOf/src/apis/mod.rs b/samples/client/others/rust/hyper/oneOf/src/apis/mod.rs index e0dbe42efe7..288eec40a0e 100644 --- a/samples/client/others/rust/hyper/oneOf/src/apis/mod.rs +++ b/samples/client/others/rust/hyper/oneOf/src/apis/mod.rs @@ -29,19 +29,19 @@ impl From<(hyper::StatusCode, hyper::body::Body)> for Error { impl From for Error { fn from(e: http::Error) -> Self { - return Error::Http(e) + Error::Http(e) } } impl From for Error { fn from(e: hyper::Error) -> Self { - return Error::Hyper(e) + Error::Hyper(e) } } impl From for Error { fn from(e: serde_json::Error) -> Self { - return Error::Serde(e) + Error::Serde(e) } } diff --git a/samples/client/others/rust/hyper/oneOf/src/lib.rs b/samples/client/others/rust/hyper/oneOf/src/lib.rs index 290e1b7b927..1de74d07cff 100644 --- a/samples/client/others/rust/hyper/oneOf/src/lib.rs +++ b/samples/client/others/rust/hyper/oneOf/src/lib.rs @@ -1,9 +1,6 @@ #![allow(unused_imports)] #![allow(clippy::too_many_arguments)] -#[macro_use] -extern crate serde_derive; - extern crate serde; extern crate serde_json; extern crate url; diff --git a/samples/client/others/rust/hyper/oneOf/src/models/addressable.rs b/samples/client/others/rust/hyper/oneOf/src/models/addressable.rs index 82d62ccc288..bbca8e7e923 100644 --- a/samples/client/others/rust/hyper/oneOf/src/models/addressable.rs +++ b/samples/client/others/rust/hyper/oneOf/src/models/addressable.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// Addressable : Base schema for addressable entities #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/others/rust/hyper/oneOf/src/models/apple.rs b/samples/client/others/rust/hyper/oneOf/src/models/apple.rs index 54b95484671..3796fb213f4 100644 --- a/samples/client/others/rust/hyper/oneOf/src/models/apple.rs +++ b/samples/client/others/rust/hyper/oneOf/src/models/apple.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct Apple { diff --git a/samples/client/others/rust/hyper/oneOf/src/models/banana.rs b/samples/client/others/rust/hyper/oneOf/src/models/banana.rs index d026dbd2b8e..4bfe4182257 100644 --- a/samples/client/others/rust/hyper/oneOf/src/models/banana.rs +++ b/samples/client/others/rust/hyper/oneOf/src/models/banana.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct Banana { diff --git a/samples/client/others/rust/hyper/oneOf/src/models/bar.rs b/samples/client/others/rust/hyper/oneOf/src/models/bar.rs index 7508b00b9af..2499fb3a586 100644 --- a/samples/client/others/rust/hyper/oneOf/src/models/bar.rs +++ b/samples/client/others/rust/hyper/oneOf/src/models/bar.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct Bar { diff --git a/samples/client/others/rust/hyper/oneOf/src/models/bar_create.rs b/samples/client/others/rust/hyper/oneOf/src/models/bar_create.rs index 0afc67998fe..6eb81b99033 100644 --- a/samples/client/others/rust/hyper/oneOf/src/models/bar_create.rs +++ b/samples/client/others/rust/hyper/oneOf/src/models/bar_create.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct BarCreate { diff --git a/samples/client/others/rust/hyper/oneOf/src/models/bar_ref.rs b/samples/client/others/rust/hyper/oneOf/src/models/bar_ref.rs index 42e2176fca0..8533dd933f5 100644 --- a/samples/client/others/rust/hyper/oneOf/src/models/bar_ref.rs +++ b/samples/client/others/rust/hyper/oneOf/src/models/bar_ref.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct BarRef { diff --git a/samples/client/others/rust/hyper/oneOf/src/models/bar_ref_or_value.rs b/samples/client/others/rust/hyper/oneOf/src/models/bar_ref_or_value.rs index 3c9312706a7..6d1977d5ba0 100644 --- a/samples/client/others/rust/hyper/oneOf/src/models/bar_ref_or_value.rs +++ b/samples/client/others/rust/hyper/oneOf/src/models/bar_ref_or_value.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] #[serde(untagged)] diff --git a/samples/client/others/rust/hyper/oneOf/src/models/entity.rs b/samples/client/others/rust/hyper/oneOf/src/models/entity.rs index b864cab686e..bfb1aac3382 100644 --- a/samples/client/others/rust/hyper/oneOf/src/models/entity.rs +++ b/samples/client/others/rust/hyper/oneOf/src/models/entity.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] #[serde(tag = "@type")] diff --git a/samples/client/others/rust/hyper/oneOf/src/models/entity_ref.rs b/samples/client/others/rust/hyper/oneOf/src/models/entity_ref.rs index 60773f6e9af..01272ef9fad 100644 --- a/samples/client/others/rust/hyper/oneOf/src/models/entity_ref.rs +++ b/samples/client/others/rust/hyper/oneOf/src/models/entity_ref.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// EntityRef : Entity reference schema to be use for all entityRef class. #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/others/rust/hyper/oneOf/src/models/extensible.rs b/samples/client/others/rust/hyper/oneOf/src/models/extensible.rs index d87abf5be19..23875ef0c6e 100644 --- a/samples/client/others/rust/hyper/oneOf/src/models/extensible.rs +++ b/samples/client/others/rust/hyper/oneOf/src/models/extensible.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct Extensible { diff --git a/samples/client/others/rust/hyper/oneOf/src/models/foo.rs b/samples/client/others/rust/hyper/oneOf/src/models/foo.rs index be82765a3a8..ea618695d0b 100644 --- a/samples/client/others/rust/hyper/oneOf/src/models/foo.rs +++ b/samples/client/others/rust/hyper/oneOf/src/models/foo.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct Foo { diff --git a/samples/client/others/rust/hyper/oneOf/src/models/foo_ref.rs b/samples/client/others/rust/hyper/oneOf/src/models/foo_ref.rs index 11640d85a7c..d0b425044b7 100644 --- a/samples/client/others/rust/hyper/oneOf/src/models/foo_ref.rs +++ b/samples/client/others/rust/hyper/oneOf/src/models/foo_ref.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct FooRef { diff --git a/samples/client/others/rust/hyper/oneOf/src/models/foo_ref_or_value.rs b/samples/client/others/rust/hyper/oneOf/src/models/foo_ref_or_value.rs index b3ad0848d62..fbbbd13150e 100644 --- a/samples/client/others/rust/hyper/oneOf/src/models/foo_ref_or_value.rs +++ b/samples/client/others/rust/hyper/oneOf/src/models/foo_ref_or_value.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] #[serde(tag = "@type")] diff --git a/samples/client/others/rust/hyper/oneOf/src/models/fruit.rs b/samples/client/others/rust/hyper/oneOf/src/models/fruit.rs index 84967523295..56d7f1eba28 100644 --- a/samples/client/others/rust/hyper/oneOf/src/models/fruit.rs +++ b/samples/client/others/rust/hyper/oneOf/src/models/fruit.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] #[serde(tag = "fruitType")] diff --git a/samples/client/others/rust/hyper/oneOf/src/models/fruit_type.rs b/samples/client/others/rust/hyper/oneOf/src/models/fruit_type.rs index 00f405a7846..e24e1de3211 100644 --- a/samples/client/others/rust/hyper/oneOf/src/models/fruit_type.rs +++ b/samples/client/others/rust/hyper/oneOf/src/models/fruit_type.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// #[derive(Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize, Deserialize)] diff --git a/samples/client/others/rust/hyper/oneOf/src/models/pasta.rs b/samples/client/others/rust/hyper/oneOf/src/models/pasta.rs index 69ae5110cf6..8ba2efce083 100644 --- a/samples/client/others/rust/hyper/oneOf/src/models/pasta.rs +++ b/samples/client/others/rust/hyper/oneOf/src/models/pasta.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct Pasta { diff --git a/samples/client/others/rust/hyper/oneOf/src/models/pizza.rs b/samples/client/others/rust/hyper/oneOf/src/models/pizza.rs index 6ae7f457df4..bfe6de64826 100644 --- a/samples/client/others/rust/hyper/oneOf/src/models/pizza.rs +++ b/samples/client/others/rust/hyper/oneOf/src/models/pizza.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct Pizza { diff --git a/samples/client/others/rust/hyper/oneOf/src/models/pizza_speziale.rs b/samples/client/others/rust/hyper/oneOf/src/models/pizza_speziale.rs index e1c5258c616..a294e07dfdb 100644 --- a/samples/client/others/rust/hyper/oneOf/src/models/pizza_speziale.rs +++ b/samples/client/others/rust/hyper/oneOf/src/models/pizza_speziale.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct PizzaSpeziale { diff --git a/samples/client/others/rust/reqwest-regression-16119/Cargo.toml b/samples/client/others/rust/reqwest-regression-16119/Cargo.toml index 529ee9eba63..1919da46b08 100644 --- a/samples/client/others/rust/reqwest-regression-16119/Cargo.toml +++ b/samples/client/others/rust/reqwest-regression-16119/Cargo.toml @@ -5,14 +5,11 @@ authors = ["OpenAPI Generator team and contributors"] description = "No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)" # Override this license by providing a License Object in the OpenAPI. license = "Unlicense" -edition = "2018" +edition = "2021" [dependencies] -serde = "^1.0" -serde_derive = "^1.0" +serde = { version = "^1.0", features = ["derive"] } serde_json = "^1.0" -url = "^2.2" -uuid = { version = "^1.0", features = ["serde", "v4"] } -[dependencies.reqwest] -version = "^0.11" -features = ["json", "blocking", "multipart"] +url = "^2.5" +uuid = { version = "^1.8", features = ["serde", "v4"] } +reqwest = { version = "^0.12", features = ["json", "blocking", "multipart"] } diff --git a/samples/client/others/rust/reqwest-regression-16119/src/apis/default_api.rs b/samples/client/others/rust/reqwest-regression-16119/src/apis/default_api.rs index 9f70938d1bc..3886a83c954 100644 --- a/samples/client/others/rust/reqwest-regression-16119/src/apis/default_api.rs +++ b/samples/client/others/rust/reqwest-regression-16119/src/apis/default_api.rs @@ -10,7 +10,7 @@ use reqwest; - +use serde::{Deserialize, Serialize}; use crate::{apis::ResponseContent, models}; use super::{Error, configuration}; diff --git a/samples/client/others/rust/reqwest-regression-16119/src/lib.rs b/samples/client/others/rust/reqwest-regression-16119/src/lib.rs index f0d1455a7ff..a1837b966dc 100644 --- a/samples/client/others/rust/reqwest-regression-16119/src/lib.rs +++ b/samples/client/others/rust/reqwest-regression-16119/src/lib.rs @@ -1,9 +1,6 @@ #![allow(unused_imports)] #![allow(clippy::too_many_arguments)] -#[macro_use] -extern crate serde_derive; - extern crate serde; extern crate serde_json; extern crate url; diff --git a/samples/client/others/rust/reqwest-regression-16119/src/models/parent.rs b/samples/client/others/rust/reqwest-regression-16119/src/models/parent.rs index 620ea7cb4b9..31d1ea44857 100644 --- a/samples/client/others/rust/reqwest-regression-16119/src/models/parent.rs +++ b/samples/client/others/rust/reqwest-regression-16119/src/models/parent.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct Parent { 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 index 7aacac5ecac..7fc367e02dd 100644 --- a/samples/client/others/rust/reqwest/api-with-ref-param/Cargo.toml +++ b/samples/client/others/rust/reqwest/api-with-ref-param/Cargo.toml @@ -5,14 +5,11 @@ authors = ["OpenAPI Generator team and contributors"] description = "No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)" # Override this license by providing a License Object in the OpenAPI. license = "Unlicense" -edition = "2018" +edition = "2021" [dependencies] -serde = "^1.0" -serde_derive = "^1.0" +serde = { version = "^1.0", features = ["derive"] } serde_json = "^1.0" -url = "^2.2" -uuid = { version = "^1.0", features = ["serde", "v4"] } -[dependencies.reqwest] -version = "^0.11" -features = ["json", "multipart"] +url = "^2.5" +uuid = { version = "^1.8", features = ["serde", "v4"] } +reqwest = { version = "^0.12", features = ["json", "multipart"] } diff --git a/samples/client/others/rust/reqwest/api-with-ref-param/src/apis/default_api.rs b/samples/client/others/rust/reqwest/api-with-ref-param/src/apis/default_api.rs index b1be5415e4d..27a37acccf4 100644 --- a/samples/client/others/rust/reqwest/api-with-ref-param/src/apis/default_api.rs +++ b/samples/client/others/rust/reqwest/api-with-ref-param/src/apis/default_api.rs @@ -10,7 +10,7 @@ use reqwest; - +use serde::{Deserialize, Serialize}; use crate::{apis::ResponseContent, models}; use super::{Error, configuration}; diff --git a/samples/client/others/rust/reqwest/api-with-ref-param/src/lib.rs b/samples/client/others/rust/reqwest/api-with-ref-param/src/lib.rs index f0d1455a7ff..a1837b966dc 100644 --- a/samples/client/others/rust/reqwest/api-with-ref-param/src/lib.rs +++ b/samples/client/others/rust/reqwest/api-with-ref-param/src/lib.rs @@ -1,9 +1,6 @@ #![allow(unused_imports)] #![allow(clippy::too_many_arguments)] -#[macro_use] -extern crate serde_derive; - extern crate serde; extern crate serde_json; extern crate url; diff --git a/samples/client/others/rust/reqwest/api-with-ref-param/src/models/color.rs b/samples/client/others/rust/reqwest/api-with-ref-param/src/models/color.rs index b5df438c652..26b274a562e 100644 --- a/samples/client/others/rust/reqwest/api-with-ref-param/src/models/color.rs +++ b/samples/client/others/rust/reqwest/api-with-ref-param/src/models/color.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// #[derive(Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize, Deserialize)] diff --git a/samples/client/others/rust/reqwest/composed-oneof/Cargo.toml b/samples/client/others/rust/reqwest/composed-oneof/Cargo.toml index 0ff96294b5a..0a06ebb4f87 100644 --- a/samples/client/others/rust/reqwest/composed-oneof/Cargo.toml +++ b/samples/client/others/rust/reqwest/composed-oneof/Cargo.toml @@ -5,14 +5,11 @@ authors = ["OpenAPI Generator team and contributors"] description = "No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)" # Override this license by providing a License Object in the OpenAPI. license = "Unlicense" -edition = "2018" +edition = "2021" [dependencies] -serde = "^1.0" -serde_derive = "^1.0" +serde = { version = "^1.0", features = ["derive"] } serde_json = "^1.0" -url = "^2.2" -uuid = { version = "^1.0", features = ["serde", "v4"] } -[dependencies.reqwest] -version = "^0.11" -features = ["json", "blocking", "multipart"] +url = "^2.5" +uuid = { version = "^1.8", features = ["serde", "v4"] } +reqwest = { version = "^0.12", features = ["json", "blocking", "multipart"] } diff --git a/samples/client/others/rust/reqwest/composed-oneof/src/apis/default_api.rs b/samples/client/others/rust/reqwest/composed-oneof/src/apis/default_api.rs index 03e6c12b171..59d4035053a 100644 --- a/samples/client/others/rust/reqwest/composed-oneof/src/apis/default_api.rs +++ b/samples/client/others/rust/reqwest/composed-oneof/src/apis/default_api.rs @@ -10,7 +10,7 @@ use reqwest; - +use serde::{Deserialize, Serialize}; use crate::{apis::ResponseContent, models}; use super::{Error, configuration}; diff --git a/samples/client/others/rust/reqwest/composed-oneof/src/lib.rs b/samples/client/others/rust/reqwest/composed-oneof/src/lib.rs index f0d1455a7ff..a1837b966dc 100644 --- a/samples/client/others/rust/reqwest/composed-oneof/src/lib.rs +++ b/samples/client/others/rust/reqwest/composed-oneof/src/lib.rs @@ -1,9 +1,6 @@ #![allow(unused_imports)] #![allow(clippy::too_many_arguments)] -#[macro_use] -extern crate serde_derive; - extern crate serde; extern crate serde_json; extern crate url; diff --git a/samples/client/others/rust/reqwest/composed-oneof/src/models/create_state_request.rs b/samples/client/others/rust/reqwest/composed-oneof/src/models/create_state_request.rs index a3ba90fcded..7e3701b8c96 100644 --- a/samples/client/others/rust/reqwest/composed-oneof/src/models/create_state_request.rs +++ b/samples/client/others/rust/reqwest/composed-oneof/src/models/create_state_request.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] #[serde(tag = "realtype")] diff --git a/samples/client/others/rust/reqwest/composed-oneof/src/models/custom_one_of_array_schema_inner.rs b/samples/client/others/rust/reqwest/composed-oneof/src/models/custom_one_of_array_schema_inner.rs index afff7fb23a6..2b3c27f0d4e 100644 --- a/samples/client/others/rust/reqwest/composed-oneof/src/models/custom_one_of_array_schema_inner.rs +++ b/samples/client/others/rust/reqwest/composed-oneof/src/models/custom_one_of_array_schema_inner.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] #[serde(tag = "realtype")] diff --git a/samples/client/others/rust/reqwest/composed-oneof/src/models/custom_one_of_schema.rs b/samples/client/others/rust/reqwest/composed-oneof/src/models/custom_one_of_schema.rs index 1b1f60a3ffd..c4f53db183d 100644 --- a/samples/client/others/rust/reqwest/composed-oneof/src/models/custom_one_of_schema.rs +++ b/samples/client/others/rust/reqwest/composed-oneof/src/models/custom_one_of_schema.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] #[serde(tag = "realtype")] diff --git a/samples/client/others/rust/reqwest/composed-oneof/src/models/get_state_200_response.rs b/samples/client/others/rust/reqwest/composed-oneof/src/models/get_state_200_response.rs index aaa86cbafbb..aeee0c377e4 100644 --- a/samples/client/others/rust/reqwest/composed-oneof/src/models/get_state_200_response.rs +++ b/samples/client/others/rust/reqwest/composed-oneof/src/models/get_state_200_response.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] #[serde(tag = "realtype")] diff --git a/samples/client/others/rust/reqwest/composed-oneof/src/models/obj_a.rs b/samples/client/others/rust/reqwest/composed-oneof/src/models/obj_a.rs index 67e72b00fed..0d581be15d9 100644 --- a/samples/client/others/rust/reqwest/composed-oneof/src/models/obj_a.rs +++ b/samples/client/others/rust/reqwest/composed-oneof/src/models/obj_a.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ObjA { diff --git a/samples/client/others/rust/reqwest/composed-oneof/src/models/obj_b.rs b/samples/client/others/rust/reqwest/composed-oneof/src/models/obj_b.rs index 835695c7661..d0c508338d8 100644 --- a/samples/client/others/rust/reqwest/composed-oneof/src/models/obj_b.rs +++ b/samples/client/others/rust/reqwest/composed-oneof/src/models/obj_b.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ObjB { diff --git a/samples/client/others/rust/reqwest/composed-oneof/src/models/obj_c.rs b/samples/client/others/rust/reqwest/composed-oneof/src/models/obj_c.rs index abc6aae2487..df21df238a3 100644 --- a/samples/client/others/rust/reqwest/composed-oneof/src/models/obj_c.rs +++ b/samples/client/others/rust/reqwest/composed-oneof/src/models/obj_c.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ObjC { diff --git a/samples/client/others/rust/reqwest/composed-oneof/src/models/obj_d.rs b/samples/client/others/rust/reqwest/composed-oneof/src/models/obj_d.rs index 287c2f24e3e..37640c7b418 100644 --- a/samples/client/others/rust/reqwest/composed-oneof/src/models/obj_d.rs +++ b/samples/client/others/rust/reqwest/composed-oneof/src/models/obj_d.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ObjD { diff --git a/samples/client/others/rust/reqwest/emptyObject/Cargo.toml b/samples/client/others/rust/reqwest/emptyObject/Cargo.toml index fa318861c57..8245af0063c 100644 --- a/samples/client/others/rust/reqwest/emptyObject/Cargo.toml +++ b/samples/client/others/rust/reqwest/emptyObject/Cargo.toml @@ -5,14 +5,11 @@ authors = ["OpenAPI Generator team and contributors"] description = "Ensure rust supports empty objects using serde::Value" # Override this license by providing a License Object in the OpenAPI. license = "Unlicense" -edition = "2018" +edition = "2021" [dependencies] -serde = "^1.0" -serde_derive = "^1.0" +serde = { version = "^1.0", features = ["derive"] } serde_json = "^1.0" -url = "^2.2" -uuid = { version = "^1.0", features = ["serde", "v4"] } -[dependencies.reqwest] -version = "^0.11" -features = ["json", "blocking", "multipart"] +url = "^2.5" +uuid = { version = "^1.8", features = ["serde", "v4"] } +reqwest = { version = "^0.12", features = ["json", "blocking", "multipart"] } diff --git a/samples/client/others/rust/reqwest/emptyObject/src/apis/default_api.rs b/samples/client/others/rust/reqwest/emptyObject/src/apis/default_api.rs index 09832aa9133..5f5b46edc2c 100644 --- a/samples/client/others/rust/reqwest/emptyObject/src/apis/default_api.rs +++ b/samples/client/others/rust/reqwest/emptyObject/src/apis/default_api.rs @@ -10,7 +10,7 @@ use reqwest; - +use serde::{Deserialize, Serialize}; use crate::{apis::ResponseContent, models}; use super::{Error, configuration}; diff --git a/samples/client/others/rust/reqwest/emptyObject/src/lib.rs b/samples/client/others/rust/reqwest/emptyObject/src/lib.rs index f0d1455a7ff..a1837b966dc 100644 --- a/samples/client/others/rust/reqwest/emptyObject/src/lib.rs +++ b/samples/client/others/rust/reqwest/emptyObject/src/lib.rs @@ -1,9 +1,6 @@ #![allow(unused_imports)] #![allow(clippy::too_many_arguments)] -#[macro_use] -extern crate serde_derive; - extern crate serde; extern crate serde_json; extern crate url; diff --git a/samples/client/others/rust/reqwest/emptyObject/src/models/empty_object.rs b/samples/client/others/rust/reqwest/emptyObject/src/models/empty_object.rs index 6db5fbff7ad..ed5bffc2d37 100644 --- a/samples/client/others/rust/reqwest/emptyObject/src/models/empty_object.rs +++ b/samples/client/others/rust/reqwest/emptyObject/src/models/empty_object.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct EmptyObject { diff --git a/samples/client/others/rust/reqwest/oneOf-array-map/Cargo.toml b/samples/client/others/rust/reqwest/oneOf-array-map/Cargo.toml index 9d5cdb68031..0b23d93ace1 100644 --- a/samples/client/others/rust/reqwest/oneOf-array-map/Cargo.toml +++ b/samples/client/others/rust/reqwest/oneOf-array-map/Cargo.toml @@ -5,14 +5,11 @@ authors = ["OpenAPI Generator team and contributors"] description = "No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)" # Override this license by providing a License Object in the OpenAPI. license = "Unlicense" -edition = "2018" +edition = "2021" [dependencies] -serde = "^1.0" -serde_derive = "^1.0" +serde = { version = "^1.0", features = ["derive"] } serde_json = "^1.0" -url = "^2.2" -uuid = { version = "^1.0", features = ["serde", "v4"] } -[dependencies.reqwest] -version = "^0.11" -features = ["json", "blocking", "multipart"] +url = "^2.5" +uuid = { version = "^1.8", features = ["serde", "v4"] } +reqwest = { version = "^0.12", features = ["json", "blocking", "multipart"] } diff --git a/samples/client/others/rust/reqwest/oneOf-array-map/src/apis/default_api.rs b/samples/client/others/rust/reqwest/oneOf-array-map/src/apis/default_api.rs index b87854cd090..c487220374e 100644 --- a/samples/client/others/rust/reqwest/oneOf-array-map/src/apis/default_api.rs +++ b/samples/client/others/rust/reqwest/oneOf-array-map/src/apis/default_api.rs @@ -10,7 +10,7 @@ use reqwest; - +use serde::{Deserialize, Serialize}; use crate::{apis::ResponseContent, models}; use super::{Error, configuration}; diff --git a/samples/client/others/rust/reqwest/oneOf-array-map/src/lib.rs b/samples/client/others/rust/reqwest/oneOf-array-map/src/lib.rs index f0d1455a7ff..a1837b966dc 100644 --- a/samples/client/others/rust/reqwest/oneOf-array-map/src/lib.rs +++ b/samples/client/others/rust/reqwest/oneOf-array-map/src/lib.rs @@ -1,9 +1,6 @@ #![allow(unused_imports)] #![allow(clippy::too_many_arguments)] -#[macro_use] -extern crate serde_derive; - extern crate serde; extern crate serde_json; extern crate url; diff --git a/samples/client/others/rust/reqwest/oneOf-array-map/src/models/apple.rs b/samples/client/others/rust/reqwest/oneOf-array-map/src/models/apple.rs index 8472b2a8e5a..a9f47c5e029 100644 --- a/samples/client/others/rust/reqwest/oneOf-array-map/src/models/apple.rs +++ b/samples/client/others/rust/reqwest/oneOf-array-map/src/models/apple.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct Apple { diff --git a/samples/client/others/rust/reqwest/oneOf-array-map/src/models/fruit.rs b/samples/client/others/rust/reqwest/oneOf-array-map/src/models/fruit.rs index 3bf995add30..827f9e47063 100644 --- a/samples/client/others/rust/reqwest/oneOf-array-map/src/models/fruit.rs +++ b/samples/client/others/rust/reqwest/oneOf-array-map/src/models/fruit.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] #[serde(untagged)] diff --git a/samples/client/others/rust/reqwest/oneOf-array-map/src/models/grape.rs b/samples/client/others/rust/reqwest/oneOf-array-map/src/models/grape.rs index bc7d12681c4..50b1144cd1d 100644 --- a/samples/client/others/rust/reqwest/oneOf-array-map/src/models/grape.rs +++ b/samples/client/others/rust/reqwest/oneOf-array-map/src/models/grape.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct Grape { diff --git a/samples/client/others/rust/reqwest/oneOf-reuseRef/Cargo.toml b/samples/client/others/rust/reqwest/oneOf-reuseRef/Cargo.toml index 4c98b337425..4d69b38b2e5 100644 --- a/samples/client/others/rust/reqwest/oneOf-reuseRef/Cargo.toml +++ b/samples/client/others/rust/reqwest/oneOf-reuseRef/Cargo.toml @@ -4,14 +4,11 @@ version = "1.0.0" authors = ["OpenAPI Generator team and contributors"] description = "No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)" license = "MIT" -edition = "2018" +edition = "2021" [dependencies] -serde = "^1.0" -serde_derive = "^1.0" +serde = { version = "^1.0", features = ["derive"] } serde_json = "^1.0" -url = "^2.2" -uuid = { version = "^1.0", features = ["serde", "v4"] } -[dependencies.reqwest] -version = "^0.11" -features = ["json", "blocking", "multipart"] +url = "^2.5" +uuid = { version = "^1.8", features = ["serde", "v4"] } +reqwest = { version = "^0.12", features = ["json", "blocking", "multipart"] } diff --git a/samples/client/others/rust/reqwest/oneOf-reuseRef/src/apis/default_api.rs b/samples/client/others/rust/reqwest/oneOf-reuseRef/src/apis/default_api.rs index c0d92bc1e7e..035872574bf 100644 --- a/samples/client/others/rust/reqwest/oneOf-reuseRef/src/apis/default_api.rs +++ b/samples/client/others/rust/reqwest/oneOf-reuseRef/src/apis/default_api.rs @@ -10,7 +10,7 @@ use reqwest; - +use serde::{Deserialize, Serialize}; use crate::{apis::ResponseContent, models}; use super::{Error, configuration}; diff --git a/samples/client/others/rust/reqwest/oneOf-reuseRef/src/lib.rs b/samples/client/others/rust/reqwest/oneOf-reuseRef/src/lib.rs index f0d1455a7ff..a1837b966dc 100644 --- a/samples/client/others/rust/reqwest/oneOf-reuseRef/src/lib.rs +++ b/samples/client/others/rust/reqwest/oneOf-reuseRef/src/lib.rs @@ -1,9 +1,6 @@ #![allow(unused_imports)] #![allow(clippy::too_many_arguments)] -#[macro_use] -extern crate serde_derive; - extern crate serde; extern crate serde_json; extern crate url; diff --git a/samples/client/others/rust/reqwest/oneOf-reuseRef/src/models/apple.rs b/samples/client/others/rust/reqwest/oneOf-reuseRef/src/models/apple.rs index 72586e60471..6a7c03c3bc1 100644 --- a/samples/client/others/rust/reqwest/oneOf-reuseRef/src/models/apple.rs +++ b/samples/client/others/rust/reqwest/oneOf-reuseRef/src/models/apple.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct Apple { diff --git a/samples/client/others/rust/reqwest/oneOf-reuseRef/src/models/banana.rs b/samples/client/others/rust/reqwest/oneOf-reuseRef/src/models/banana.rs index b3dfb65a245..a80f3d23e0f 100644 --- a/samples/client/others/rust/reqwest/oneOf-reuseRef/src/models/banana.rs +++ b/samples/client/others/rust/reqwest/oneOf-reuseRef/src/models/banana.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct Banana { diff --git a/samples/client/others/rust/reqwest/oneOf-reuseRef/src/models/fruit.rs b/samples/client/others/rust/reqwest/oneOf-reuseRef/src/models/fruit.rs index e1b018e8411..cd28f15520c 100644 --- a/samples/client/others/rust/reqwest/oneOf-reuseRef/src/models/fruit.rs +++ b/samples/client/others/rust/reqwest/oneOf-reuseRef/src/models/fruit.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] #[serde(tag = "fruitType")] diff --git a/samples/client/others/rust/reqwest/oneOf/Cargo.toml b/samples/client/others/rust/reqwest/oneOf/Cargo.toml index 91e5d81c55b..89997ba9566 100644 --- a/samples/client/others/rust/reqwest/oneOf/Cargo.toml +++ b/samples/client/others/rust/reqwest/oneOf/Cargo.toml @@ -5,14 +5,11 @@ authors = ["OpenAPI Generator team and contributors"] description = "This tests for a oneOf interface representation " # Override this license by providing a License Object in the OpenAPI. license = "Unlicense" -edition = "2018" +edition = "2021" [dependencies] -serde = "^1.0" -serde_derive = "^1.0" +serde = { version = "^1.0", features = ["derive"] } serde_json = "^1.0" -url = "^2.2" -uuid = { version = "^1.0", features = ["serde", "v4"] } -[dependencies.reqwest] -version = "^0.11" -features = ["json", "blocking", "multipart"] +url = "^2.5" +uuid = { version = "^1.8", features = ["serde", "v4"] } +reqwest = { version = "^0.12", features = ["json", "blocking", "multipart"] } diff --git a/samples/client/others/rust/reqwest/oneOf/src/apis/bar_api.rs b/samples/client/others/rust/reqwest/oneOf/src/apis/bar_api.rs index 2d07cacdb49..f8ce13d5cac 100644 --- a/samples/client/others/rust/reqwest/oneOf/src/apis/bar_api.rs +++ b/samples/client/others/rust/reqwest/oneOf/src/apis/bar_api.rs @@ -10,7 +10,7 @@ use reqwest; - +use serde::{Deserialize, Serialize}; use crate::{apis::ResponseContent, models}; use super::{Error, configuration}; diff --git a/samples/client/others/rust/reqwest/oneOf/src/apis/foo_api.rs b/samples/client/others/rust/reqwest/oneOf/src/apis/foo_api.rs index be07fec2008..202e6bb6679 100644 --- a/samples/client/others/rust/reqwest/oneOf/src/apis/foo_api.rs +++ b/samples/client/others/rust/reqwest/oneOf/src/apis/foo_api.rs @@ -10,7 +10,7 @@ use reqwest; - +use serde::{Deserialize, Serialize}; use crate::{apis::ResponseContent, models}; use super::{Error, configuration}; diff --git a/samples/client/others/rust/reqwest/oneOf/src/lib.rs b/samples/client/others/rust/reqwest/oneOf/src/lib.rs index f0d1455a7ff..a1837b966dc 100644 --- a/samples/client/others/rust/reqwest/oneOf/src/lib.rs +++ b/samples/client/others/rust/reqwest/oneOf/src/lib.rs @@ -1,9 +1,6 @@ #![allow(unused_imports)] #![allow(clippy::too_many_arguments)] -#[macro_use] -extern crate serde_derive; - extern crate serde; extern crate serde_json; extern crate url; diff --git a/samples/client/others/rust/reqwest/oneOf/src/models/addressable.rs b/samples/client/others/rust/reqwest/oneOf/src/models/addressable.rs index 82d62ccc288..bbca8e7e923 100644 --- a/samples/client/others/rust/reqwest/oneOf/src/models/addressable.rs +++ b/samples/client/others/rust/reqwest/oneOf/src/models/addressable.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// Addressable : Base schema for addressable entities #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/others/rust/reqwest/oneOf/src/models/apple.rs b/samples/client/others/rust/reqwest/oneOf/src/models/apple.rs index 54b95484671..3796fb213f4 100644 --- a/samples/client/others/rust/reqwest/oneOf/src/models/apple.rs +++ b/samples/client/others/rust/reqwest/oneOf/src/models/apple.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct Apple { diff --git a/samples/client/others/rust/reqwest/oneOf/src/models/banana.rs b/samples/client/others/rust/reqwest/oneOf/src/models/banana.rs index d026dbd2b8e..4bfe4182257 100644 --- a/samples/client/others/rust/reqwest/oneOf/src/models/banana.rs +++ b/samples/client/others/rust/reqwest/oneOf/src/models/banana.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct Banana { diff --git a/samples/client/others/rust/reqwest/oneOf/src/models/bar.rs b/samples/client/others/rust/reqwest/oneOf/src/models/bar.rs index 7508b00b9af..2499fb3a586 100644 --- a/samples/client/others/rust/reqwest/oneOf/src/models/bar.rs +++ b/samples/client/others/rust/reqwest/oneOf/src/models/bar.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct Bar { diff --git a/samples/client/others/rust/reqwest/oneOf/src/models/bar_create.rs b/samples/client/others/rust/reqwest/oneOf/src/models/bar_create.rs index 0afc67998fe..6eb81b99033 100644 --- a/samples/client/others/rust/reqwest/oneOf/src/models/bar_create.rs +++ b/samples/client/others/rust/reqwest/oneOf/src/models/bar_create.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct BarCreate { diff --git a/samples/client/others/rust/reqwest/oneOf/src/models/bar_ref.rs b/samples/client/others/rust/reqwest/oneOf/src/models/bar_ref.rs index 42e2176fca0..8533dd933f5 100644 --- a/samples/client/others/rust/reqwest/oneOf/src/models/bar_ref.rs +++ b/samples/client/others/rust/reqwest/oneOf/src/models/bar_ref.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct BarRef { diff --git a/samples/client/others/rust/reqwest/oneOf/src/models/bar_ref_or_value.rs b/samples/client/others/rust/reqwest/oneOf/src/models/bar_ref_or_value.rs index 3c9312706a7..6d1977d5ba0 100644 --- a/samples/client/others/rust/reqwest/oneOf/src/models/bar_ref_or_value.rs +++ b/samples/client/others/rust/reqwest/oneOf/src/models/bar_ref_or_value.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] #[serde(untagged)] diff --git a/samples/client/others/rust/reqwest/oneOf/src/models/entity.rs b/samples/client/others/rust/reqwest/oneOf/src/models/entity.rs index b864cab686e..bfb1aac3382 100644 --- a/samples/client/others/rust/reqwest/oneOf/src/models/entity.rs +++ b/samples/client/others/rust/reqwest/oneOf/src/models/entity.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] #[serde(tag = "@type")] diff --git a/samples/client/others/rust/reqwest/oneOf/src/models/entity_ref.rs b/samples/client/others/rust/reqwest/oneOf/src/models/entity_ref.rs index 60773f6e9af..01272ef9fad 100644 --- a/samples/client/others/rust/reqwest/oneOf/src/models/entity_ref.rs +++ b/samples/client/others/rust/reqwest/oneOf/src/models/entity_ref.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// EntityRef : Entity reference schema to be use for all entityRef class. #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/others/rust/reqwest/oneOf/src/models/extensible.rs b/samples/client/others/rust/reqwest/oneOf/src/models/extensible.rs index d87abf5be19..23875ef0c6e 100644 --- a/samples/client/others/rust/reqwest/oneOf/src/models/extensible.rs +++ b/samples/client/others/rust/reqwest/oneOf/src/models/extensible.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct Extensible { diff --git a/samples/client/others/rust/reqwest/oneOf/src/models/foo.rs b/samples/client/others/rust/reqwest/oneOf/src/models/foo.rs index be82765a3a8..ea618695d0b 100644 --- a/samples/client/others/rust/reqwest/oneOf/src/models/foo.rs +++ b/samples/client/others/rust/reqwest/oneOf/src/models/foo.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct Foo { diff --git a/samples/client/others/rust/reqwest/oneOf/src/models/foo_ref.rs b/samples/client/others/rust/reqwest/oneOf/src/models/foo_ref.rs index 11640d85a7c..d0b425044b7 100644 --- a/samples/client/others/rust/reqwest/oneOf/src/models/foo_ref.rs +++ b/samples/client/others/rust/reqwest/oneOf/src/models/foo_ref.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct FooRef { diff --git a/samples/client/others/rust/reqwest/oneOf/src/models/foo_ref_or_value.rs b/samples/client/others/rust/reqwest/oneOf/src/models/foo_ref_or_value.rs index b3ad0848d62..fbbbd13150e 100644 --- a/samples/client/others/rust/reqwest/oneOf/src/models/foo_ref_or_value.rs +++ b/samples/client/others/rust/reqwest/oneOf/src/models/foo_ref_or_value.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] #[serde(tag = "@type")] diff --git a/samples/client/others/rust/reqwest/oneOf/src/models/fruit.rs b/samples/client/others/rust/reqwest/oneOf/src/models/fruit.rs index 84967523295..56d7f1eba28 100644 --- a/samples/client/others/rust/reqwest/oneOf/src/models/fruit.rs +++ b/samples/client/others/rust/reqwest/oneOf/src/models/fruit.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Debug, PartialEq, Serialize, Deserialize)] #[serde(tag = "fruitType")] diff --git a/samples/client/others/rust/reqwest/oneOf/src/models/fruit_type.rs b/samples/client/others/rust/reqwest/oneOf/src/models/fruit_type.rs index 00f405a7846..e24e1de3211 100644 --- a/samples/client/others/rust/reqwest/oneOf/src/models/fruit_type.rs +++ b/samples/client/others/rust/reqwest/oneOf/src/models/fruit_type.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// #[derive(Clone, Copy, Debug, Eq, PartialEq, Ord, PartialOrd, Hash, Serialize, Deserialize)] diff --git a/samples/client/others/rust/reqwest/oneOf/src/models/pasta.rs b/samples/client/others/rust/reqwest/oneOf/src/models/pasta.rs index 69ae5110cf6..8ba2efce083 100644 --- a/samples/client/others/rust/reqwest/oneOf/src/models/pasta.rs +++ b/samples/client/others/rust/reqwest/oneOf/src/models/pasta.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct Pasta { diff --git a/samples/client/others/rust/reqwest/oneOf/src/models/pizza.rs b/samples/client/others/rust/reqwest/oneOf/src/models/pizza.rs index 6ae7f457df4..bfe6de64826 100644 --- a/samples/client/others/rust/reqwest/oneOf/src/models/pizza.rs +++ b/samples/client/others/rust/reqwest/oneOf/src/models/pizza.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct Pizza { diff --git a/samples/client/others/rust/reqwest/oneOf/src/models/pizza_speziale.rs b/samples/client/others/rust/reqwest/oneOf/src/models/pizza_speziale.rs index e1c5258c616..a294e07dfdb 100644 --- a/samples/client/others/rust/reqwest/oneOf/src/models/pizza_speziale.rs +++ b/samples/client/others/rust/reqwest/oneOf/src/models/pizza_speziale.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct PizzaSpeziale { diff --git a/samples/client/petstore/rust/Cargo.toml b/samples/client/petstore/rust/Cargo.toml index 46b06cf9bbe..90aec2be42a 100644 --- a/samples/client/petstore/rust/Cargo.toml +++ b/samples/client/petstore/rust/Cargo.toml @@ -1,2 +1,3 @@ [workspace] members = ["hyper/*", "reqwest/*"] +resolver = "2" diff --git a/samples/client/petstore/rust/hyper/petstore/Cargo.toml b/samples/client/petstore/rust/hyper/petstore/Cargo.toml index 60ee14ea87a..d8b82608d37 100644 --- a/samples/client/petstore/rust/hyper/petstore/Cargo.toml +++ b/samples/client/petstore/rust/hyper/petstore/Cargo.toml @@ -4,15 +4,14 @@ version = "1.0.0" authors = ["OpenAPI Generator team and contributors"] description = "This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters." license = "Apache-2.0" -edition = "2018" +edition = "2021" [dependencies] -serde = "^1.0" -serde_derive = "^1.0" -serde_with = { version = "^3", default-features = false, features = ["base64", "std", "macros"] } +serde = { version = "^1.0", features = ["derive"] } +serde_with = { version = "^3.8", default-features = false, features = ["base64", "std", "macros"] } serde_json = "^1.0" -url = "^2.2" -uuid = { version = "^1.0", features = ["serde", "v4"] } +url = "^2.5" +uuid = { version = "^1.8", features = ["serde", "v4"] } hyper = { version = "~0.14", features = ["full"] } hyper-tls = "~0.5" http = "~0.2" diff --git a/samples/client/petstore/rust/hyper/petstore/src/apis/mod.rs b/samples/client/petstore/rust/hyper/petstore/src/apis/mod.rs index 2abfb5a4e60..df848ad3c6b 100644 --- a/samples/client/petstore/rust/hyper/petstore/src/apis/mod.rs +++ b/samples/client/petstore/rust/hyper/petstore/src/apis/mod.rs @@ -29,19 +29,19 @@ impl From<(hyper::StatusCode, hyper::body::Body)> for Error { impl From for Error { fn from(e: http::Error) -> Self { - return Error::Http(e) + Error::Http(e) } } impl From for Error { fn from(e: hyper::Error) -> Self { - return Error::Hyper(e) + Error::Hyper(e) } } impl From for Error { fn from(e: serde_json::Error) -> Self { - return Error::Serde(e) + Error::Serde(e) } } diff --git a/samples/client/petstore/rust/hyper/petstore/src/lib.rs b/samples/client/petstore/rust/hyper/petstore/src/lib.rs index 290e1b7b927..1de74d07cff 100644 --- a/samples/client/petstore/rust/hyper/petstore/src/lib.rs +++ b/samples/client/petstore/rust/hyper/petstore/src/lib.rs @@ -1,9 +1,6 @@ #![allow(unused_imports)] #![allow(clippy::too_many_arguments)] -#[macro_use] -extern crate serde_derive; - extern crate serde; extern crate serde_json; extern crate url; diff --git a/samples/client/petstore/rust/hyper/petstore/src/models/action_container.rs b/samples/client/petstore/rust/hyper/petstore/src/models/action_container.rs index 81cca99e8ac..11d2f0b8712 100644 --- a/samples/client/petstore/rust/hyper/petstore/src/models/action_container.rs +++ b/samples/client/petstore/rust/hyper/petstore/src/models/action_container.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ActionContainer { diff --git a/samples/client/petstore/rust/hyper/petstore/src/models/api_response.rs b/samples/client/petstore/rust/hyper/petstore/src/models/api_response.rs index 4814a31da53..0a60da0f477 100644 --- a/samples/client/petstore/rust/hyper/petstore/src/models/api_response.rs +++ b/samples/client/petstore/rust/hyper/petstore/src/models/api_response.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// ApiResponse : Describes the result of uploading an image resource #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/hyper/petstore/src/models/array_item_ref_test.rs b/samples/client/petstore/rust/hyper/petstore/src/models/array_item_ref_test.rs index 5948b180912..4ac1e8a2fe9 100644 --- a/samples/client/petstore/rust/hyper/petstore/src/models/array_item_ref_test.rs +++ b/samples/client/petstore/rust/hyper/petstore/src/models/array_item_ref_test.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// ArrayItemRefTest : Test handling of object reference in arrays #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/hyper/petstore/src/models/baz.rs b/samples/client/petstore/rust/hyper/petstore/src/models/baz.rs index d2a840a2d67..dcf25d8465a 100644 --- a/samples/client/petstore/rust/hyper/petstore/src/models/baz.rs +++ b/samples/client/petstore/rust/hyper/petstore/src/models/baz.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// Baz : Test handling of empty variants /// Test handling of empty variants diff --git a/samples/client/petstore/rust/hyper/petstore/src/models/category.rs b/samples/client/petstore/rust/hyper/petstore/src/models/category.rs index 2d2b29334de..9ecf89d354d 100644 --- a/samples/client/petstore/rust/hyper/petstore/src/models/category.rs +++ b/samples/client/petstore/rust/hyper/petstore/src/models/category.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// Category : A category for a pet #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/hyper/petstore/src/models/enum_array_testing.rs b/samples/client/petstore/rust/hyper/petstore/src/models/enum_array_testing.rs index 499c3359513..2ac40c30775 100644 --- a/samples/client/petstore/rust/hyper/petstore/src/models/enum_array_testing.rs +++ b/samples/client/petstore/rust/hyper/petstore/src/models/enum_array_testing.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// EnumArrayTesting : Test of enum array #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/hyper/petstore/src/models/model_ref.rs b/samples/client/petstore/rust/hyper/petstore/src/models/model_ref.rs index cd0928bf9c2..9862cb1a48e 100644 --- a/samples/client/petstore/rust/hyper/petstore/src/models/model_ref.rs +++ b/samples/client/petstore/rust/hyper/petstore/src/models/model_ref.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// Ref : using reserved word as model name #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/hyper/petstore/src/models/model_return.rs b/samples/client/petstore/rust/hyper/petstore/src/models/model_return.rs index 933b644a7f3..07d9268e6e6 100644 --- a/samples/client/petstore/rust/hyper/petstore/src/models/model_return.rs +++ b/samples/client/petstore/rust/hyper/petstore/src/models/model_return.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// Return : Test using keywords #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/hyper/petstore/src/models/nullable_array.rs b/samples/client/petstore/rust/hyper/petstore/src/models/nullable_array.rs index 6ddbb5c0ece..a155ea1176a 100644 --- a/samples/client/petstore/rust/hyper/petstore/src/models/nullable_array.rs +++ b/samples/client/petstore/rust/hyper/petstore/src/models/nullable_array.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct NullableArray { diff --git a/samples/client/petstore/rust/hyper/petstore/src/models/optional_testing.rs b/samples/client/petstore/rust/hyper/petstore/src/models/optional_testing.rs index 57d224f831d..72e5a009a62 100644 --- a/samples/client/petstore/rust/hyper/petstore/src/models/optional_testing.rs +++ b/samples/client/petstore/rust/hyper/petstore/src/models/optional_testing.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// OptionalTesting : Test handling of optional and nullable fields #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/hyper/petstore/src/models/order.rs b/samples/client/petstore/rust/hyper/petstore/src/models/order.rs index 5d16df143aa..e81f64a2980 100644 --- a/samples/client/petstore/rust/hyper/petstore/src/models/order.rs +++ b/samples/client/petstore/rust/hyper/petstore/src/models/order.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// Order : An order for a pets from the pet store #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/hyper/petstore/src/models/pet.rs b/samples/client/petstore/rust/hyper/petstore/src/models/pet.rs index 59d9a9f1158..785fb5390be 100644 --- a/samples/client/petstore/rust/hyper/petstore/src/models/pet.rs +++ b/samples/client/petstore/rust/hyper/petstore/src/models/pet.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// Pet : A pet for sale in the pet store #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/hyper/petstore/src/models/property_test.rs b/samples/client/petstore/rust/hyper/petstore/src/models/property_test.rs index 1b92525f28b..c98e7c762b5 100644 --- a/samples/client/petstore/rust/hyper/petstore/src/models/property_test.rs +++ b/samples/client/petstore/rust/hyper/petstore/src/models/property_test.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// PropertyTest : A model to test various formats, e.g. UUID #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/hyper/petstore/src/models/tag.rs b/samples/client/petstore/rust/hyper/petstore/src/models/tag.rs index 151840c8856..8fe4eebd723 100644 --- a/samples/client/petstore/rust/hyper/petstore/src/models/tag.rs +++ b/samples/client/petstore/rust/hyper/petstore/src/models/tag.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// Tag : A tag for a pet #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/hyper/petstore/src/models/type_testing.rs b/samples/client/petstore/rust/hyper/petstore/src/models/type_testing.rs index dac3b59eb1f..dba87bdb3cf 100644 --- a/samples/client/petstore/rust/hyper/petstore/src/models/type_testing.rs +++ b/samples/client/petstore/rust/hyper/petstore/src/models/type_testing.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; use serde_with::serde_as; diff --git a/samples/client/petstore/rust/hyper/petstore/src/models/unique_item_array_testing.rs b/samples/client/petstore/rust/hyper/petstore/src/models/unique_item_array_testing.rs index a40f77afc0e..2a1f18ca9ce 100644 --- a/samples/client/petstore/rust/hyper/petstore/src/models/unique_item_array_testing.rs +++ b/samples/client/petstore/rust/hyper/petstore/src/models/unique_item_array_testing.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// UniqueItemArrayTesting : Test handling of enum array with unique items #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/hyper/petstore/src/models/user.rs b/samples/client/petstore/rust/hyper/petstore/src/models/user.rs index f16b7f785f7..c88c469a4eb 100644 --- a/samples/client/petstore/rust/hyper/petstore/src/models/user.rs +++ b/samples/client/petstore/rust/hyper/petstore/src/models/user.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// User : A User who is purchasing from the pet store #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/name-mapping/Cargo.toml b/samples/client/petstore/rust/reqwest/name-mapping/Cargo.toml index d7c5df28fbf..120ba16c882 100644 --- a/samples/client/petstore/rust/reqwest/name-mapping/Cargo.toml +++ b/samples/client/petstore/rust/reqwest/name-mapping/Cargo.toml @@ -4,14 +4,11 @@ version = "1.0.0" authors = ["OpenAPI Generator team and contributors"] description = "rust name mapping test" license = "Apache-2.0" -edition = "2018" +edition = "2021" [dependencies] -serde = "^1.0" -serde_derive = "^1.0" +serde = { version = "^1.0", features = ["derive"] } serde_json = "^1.0" -url = "^2.2" -uuid = { version = "^1.0", features = ["serde", "v4"] } -[dependencies.reqwest] -version = "^0.11" -features = ["json", "blocking", "multipart"] +url = "^2.5" +uuid = { version = "^1.8", features = ["serde", "v4"] } +reqwest = { version = "^0.12", features = ["json", "blocking", "multipart"] } diff --git a/samples/client/petstore/rust/reqwest/name-mapping/src/apis/fake_api.rs b/samples/client/petstore/rust/reqwest/name-mapping/src/apis/fake_api.rs index e40fc8b66c4..e7f8c27a8f0 100644 --- a/samples/client/petstore/rust/reqwest/name-mapping/src/apis/fake_api.rs +++ b/samples/client/petstore/rust/reqwest/name-mapping/src/apis/fake_api.rs @@ -10,7 +10,7 @@ use reqwest; - +use serde::{Deserialize, Serialize}; use crate::{apis::ResponseContent, models}; use super::{Error, configuration}; diff --git a/samples/client/petstore/rust/reqwest/name-mapping/src/lib.rs b/samples/client/petstore/rust/reqwest/name-mapping/src/lib.rs index f0d1455a7ff..a1837b966dc 100644 --- a/samples/client/petstore/rust/reqwest/name-mapping/src/lib.rs +++ b/samples/client/petstore/rust/reqwest/name-mapping/src/lib.rs @@ -1,9 +1,6 @@ #![allow(unused_imports)] #![allow(clippy::too_many_arguments)] -#[macro_use] -extern crate serde_derive; - extern crate serde; extern crate serde_json; extern crate url; diff --git a/samples/client/petstore/rust/reqwest/name-mapping/src/models/property_name_mapping.rs b/samples/client/petstore/rust/reqwest/name-mapping/src/models/property_name_mapping.rs index e420ed1280c..caf948339e0 100644 --- a/samples/client/petstore/rust/reqwest/name-mapping/src/models/property_name_mapping.rs +++ b/samples/client/petstore/rust/reqwest/name-mapping/src/models/property_name_mapping.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct PropertyNameMapping { diff --git a/samples/client/petstore/rust/reqwest/petstore-async-middleware/Cargo.toml b/samples/client/petstore/rust/reqwest/petstore-async-middleware/Cargo.toml index 8f223da8731..cd7d83abaa6 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async-middleware/Cargo.toml +++ b/samples/client/petstore/rust/reqwest/petstore-async-middleware/Cargo.toml @@ -4,16 +4,13 @@ version = "1.0.0" authors = ["OpenAPI Generator team and contributors"] description = "This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters." license = "Apache-2.0" -edition = "2018" +edition = "2021" [dependencies] -serde = "^1.0" -serde_derive = "^1.0" -serde_with = { version = "^3", default-features = false, features = ["base64", "std", "macros"] } +serde = { version = "^1.0", features = ["derive"] } +serde_with = { version = "^3.8", default-features = false, features = ["base64", "std", "macros"] } serde_json = "^1.0" -url = "^2.2" -uuid = { version = "^1.0", features = ["serde", "v4"] } -reqwest-middleware = "0.2.0" -[dependencies.reqwest] -version = "^0.11" -features = ["json", "multipart"] +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"] } diff --git a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/apis/fake_api.rs b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/apis/fake_api.rs index 78d3ba30ec0..3f10b5b6c2a 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/apis/fake_api.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/apis/fake_api.rs @@ -10,7 +10,7 @@ use reqwest; - +use serde::{Deserialize, Serialize}; use crate::{apis::ResponseContent, models}; use super::{Error, configuration}; diff --git a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/apis/pet_api.rs b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/apis/pet_api.rs index ccdefa44be1..0a44b19a32d 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/apis/pet_api.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/apis/pet_api.rs @@ -10,7 +10,7 @@ use reqwest; - +use serde::{Deserialize, Serialize}; use crate::{apis::ResponseContent, models}; use super::{Error, configuration}; diff --git a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/apis/store_api.rs b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/apis/store_api.rs index d08b7b74e46..67fd03a80f5 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/apis/store_api.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/apis/store_api.rs @@ -10,7 +10,7 @@ use reqwest; - +use serde::{Deserialize, Serialize}; use crate::{apis::ResponseContent, models}; use super::{Error, configuration}; diff --git a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/apis/testing_api.rs b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/apis/testing_api.rs index 86f87242fcc..83d1a00fb4c 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/apis/testing_api.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/apis/testing_api.rs @@ -10,7 +10,7 @@ use reqwest; - +use serde::{Deserialize, Serialize}; use crate::{apis::ResponseContent, models}; use super::{Error, configuration}; diff --git a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/apis/user_api.rs b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/apis/user_api.rs index 32594255a63..4f28c21c1cf 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/apis/user_api.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/apis/user_api.rs @@ -10,7 +10,7 @@ use reqwest; - +use serde::{Deserialize, Serialize}; use crate::{apis::ResponseContent, models}; use super::{Error, configuration}; diff --git a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/lib.rs b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/lib.rs index f0d1455a7ff..a1837b966dc 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/lib.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/lib.rs @@ -1,9 +1,6 @@ #![allow(unused_imports)] #![allow(clippy::too_many_arguments)] -#[macro_use] -extern crate serde_derive; - extern crate serde; extern crate serde_json; extern crate url; diff --git a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/action_container.rs b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/action_container.rs index 81cca99e8ac..11d2f0b8712 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/action_container.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/action_container.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ActionContainer { diff --git a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/api_response.rs b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/api_response.rs index 4814a31da53..0a60da0f477 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/api_response.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/api_response.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// ApiResponse : Describes the result of uploading an image resource #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/array_item_ref_test.rs b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/array_item_ref_test.rs index 5948b180912..4ac1e8a2fe9 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/array_item_ref_test.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/array_item_ref_test.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// ArrayItemRefTest : Test handling of object reference in arrays #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/baz.rs b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/baz.rs index d2a840a2d67..dcf25d8465a 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/baz.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/baz.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// Baz : Test handling of empty variants /// Test handling of empty variants diff --git a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/category.rs b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/category.rs index 2d2b29334de..9ecf89d354d 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/category.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/category.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// Category : A category for a pet #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/enum_array_testing.rs b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/enum_array_testing.rs index 499c3359513..2ac40c30775 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/enum_array_testing.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/enum_array_testing.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// EnumArrayTesting : Test of enum array #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/model_ref.rs b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/model_ref.rs index cd0928bf9c2..9862cb1a48e 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/model_ref.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/model_ref.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// Ref : using reserved word as model name #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/model_return.rs b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/model_return.rs index 933b644a7f3..07d9268e6e6 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/model_return.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/model_return.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// Return : Test using keywords #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/nullable_array.rs b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/nullable_array.rs index 6ddbb5c0ece..a155ea1176a 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/nullable_array.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/nullable_array.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct NullableArray { diff --git a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/optional_testing.rs b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/optional_testing.rs index 57d224f831d..72e5a009a62 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/optional_testing.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/optional_testing.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// OptionalTesting : Test handling of optional and nullable fields #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/order.rs b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/order.rs index 5d16df143aa..e81f64a2980 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/order.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/order.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// Order : An order for a pets from the pet store #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/pet.rs b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/pet.rs index 59d9a9f1158..785fb5390be 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/pet.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/pet.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// Pet : A pet for sale in the pet store #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/property_test.rs b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/property_test.rs index 1b92525f28b..c98e7c762b5 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/property_test.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/property_test.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// PropertyTest : A model to test various formats, e.g. UUID #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/tag.rs b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/tag.rs index 151840c8856..8fe4eebd723 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/tag.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/tag.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// Tag : A tag for a pet #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/type_testing.rs b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/type_testing.rs index dac3b59eb1f..dba87bdb3cf 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/type_testing.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/type_testing.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; use serde_with::serde_as; diff --git a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/unique_item_array_testing.rs b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/unique_item_array_testing.rs index a40f77afc0e..2a1f18ca9ce 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/unique_item_array_testing.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/unique_item_array_testing.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// UniqueItemArrayTesting : Test handling of enum array with unique items #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/user.rs b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/user.rs index f16b7f785f7..c88c469a4eb 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/user.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async-middleware/src/models/user.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// User : A User who is purchasing from the pet store #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore-async/Cargo.toml b/samples/client/petstore/rust/reqwest/petstore-async/Cargo.toml index e84c3e69887..8fa64e90a2f 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async/Cargo.toml +++ b/samples/client/petstore/rust/reqwest/petstore-async/Cargo.toml @@ -4,15 +4,12 @@ version = "1.0.0" authors = ["OpenAPI Generator team and contributors"] description = "This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters." license = "Apache-2.0" -edition = "2018" +edition = "2021" [dependencies] -serde = "^1.0" -serde_derive = "^1.0" -serde_with = { version = "^3", default-features = false, features = ["base64", "std", "macros"] } +serde = { version = "^1.0", features = ["derive"] } +serde_with = { version = "^3.8", default-features = false, features = ["base64", "std", "macros"] } serde_json = "^1.0" -url = "^2.2" -uuid = { version = "^1.0", features = ["serde", "v4"] } -[dependencies.reqwest] -version = "^0.11" -features = ["json", "multipart"] +url = "^2.5" +uuid = { version = "^1.8", features = ["serde", "v4"] } +reqwest = { version = "^0.12", features = ["json", "multipart"] } diff --git a/samples/client/petstore/rust/reqwest/petstore-async/src/apis/fake_api.rs b/samples/client/petstore/rust/reqwest/petstore-async/src/apis/fake_api.rs index 78d3ba30ec0..3f10b5b6c2a 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async/src/apis/fake_api.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async/src/apis/fake_api.rs @@ -10,7 +10,7 @@ use reqwest; - +use serde::{Deserialize, Serialize}; use crate::{apis::ResponseContent, models}; use super::{Error, configuration}; diff --git a/samples/client/petstore/rust/reqwest/petstore-async/src/apis/pet_api.rs b/samples/client/petstore/rust/reqwest/petstore-async/src/apis/pet_api.rs index ccdefa44be1..0a44b19a32d 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async/src/apis/pet_api.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async/src/apis/pet_api.rs @@ -10,7 +10,7 @@ use reqwest; - +use serde::{Deserialize, Serialize}; use crate::{apis::ResponseContent, models}; use super::{Error, configuration}; diff --git a/samples/client/petstore/rust/reqwest/petstore-async/src/apis/store_api.rs b/samples/client/petstore/rust/reqwest/petstore-async/src/apis/store_api.rs index d08b7b74e46..67fd03a80f5 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async/src/apis/store_api.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async/src/apis/store_api.rs @@ -10,7 +10,7 @@ use reqwest; - +use serde::{Deserialize, Serialize}; use crate::{apis::ResponseContent, models}; use super::{Error, configuration}; diff --git a/samples/client/petstore/rust/reqwest/petstore-async/src/apis/testing_api.rs b/samples/client/petstore/rust/reqwest/petstore-async/src/apis/testing_api.rs index 86f87242fcc..83d1a00fb4c 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async/src/apis/testing_api.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async/src/apis/testing_api.rs @@ -10,7 +10,7 @@ use reqwest; - +use serde::{Deserialize, Serialize}; use crate::{apis::ResponseContent, models}; use super::{Error, configuration}; diff --git a/samples/client/petstore/rust/reqwest/petstore-async/src/apis/user_api.rs b/samples/client/petstore/rust/reqwest/petstore-async/src/apis/user_api.rs index 32594255a63..4f28c21c1cf 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async/src/apis/user_api.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async/src/apis/user_api.rs @@ -10,7 +10,7 @@ use reqwest; - +use serde::{Deserialize, Serialize}; use crate::{apis::ResponseContent, models}; use super::{Error, configuration}; diff --git a/samples/client/petstore/rust/reqwest/petstore-async/src/lib.rs b/samples/client/petstore/rust/reqwest/petstore-async/src/lib.rs index f0d1455a7ff..a1837b966dc 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async/src/lib.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async/src/lib.rs @@ -1,9 +1,6 @@ #![allow(unused_imports)] #![allow(clippy::too_many_arguments)] -#[macro_use] -extern crate serde_derive; - extern crate serde; extern crate serde_json; extern crate url; diff --git a/samples/client/petstore/rust/reqwest/petstore-async/src/models/action_container.rs b/samples/client/petstore/rust/reqwest/petstore-async/src/models/action_container.rs index 81cca99e8ac..11d2f0b8712 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async/src/models/action_container.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async/src/models/action_container.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ActionContainer { diff --git a/samples/client/petstore/rust/reqwest/petstore-async/src/models/api_response.rs b/samples/client/petstore/rust/reqwest/petstore-async/src/models/api_response.rs index 4814a31da53..0a60da0f477 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async/src/models/api_response.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async/src/models/api_response.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// ApiResponse : Describes the result of uploading an image resource #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore-async/src/models/array_item_ref_test.rs b/samples/client/petstore/rust/reqwest/petstore-async/src/models/array_item_ref_test.rs index 5948b180912..4ac1e8a2fe9 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async/src/models/array_item_ref_test.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async/src/models/array_item_ref_test.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// ArrayItemRefTest : Test handling of object reference in arrays #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore-async/src/models/baz.rs b/samples/client/petstore/rust/reqwest/petstore-async/src/models/baz.rs index d2a840a2d67..dcf25d8465a 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async/src/models/baz.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async/src/models/baz.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// Baz : Test handling of empty variants /// Test handling of empty variants diff --git a/samples/client/petstore/rust/reqwest/petstore-async/src/models/category.rs b/samples/client/petstore/rust/reqwest/petstore-async/src/models/category.rs index 2d2b29334de..9ecf89d354d 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async/src/models/category.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async/src/models/category.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// Category : A category for a pet #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore-async/src/models/enum_array_testing.rs b/samples/client/petstore/rust/reqwest/petstore-async/src/models/enum_array_testing.rs index 499c3359513..2ac40c30775 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async/src/models/enum_array_testing.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async/src/models/enum_array_testing.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// EnumArrayTesting : Test of enum array #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore-async/src/models/model_ref.rs b/samples/client/petstore/rust/reqwest/petstore-async/src/models/model_ref.rs index cd0928bf9c2..9862cb1a48e 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async/src/models/model_ref.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async/src/models/model_ref.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// Ref : using reserved word as model name #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore-async/src/models/model_return.rs b/samples/client/petstore/rust/reqwest/petstore-async/src/models/model_return.rs index 933b644a7f3..07d9268e6e6 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async/src/models/model_return.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async/src/models/model_return.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// Return : Test using keywords #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore-async/src/models/nullable_array.rs b/samples/client/petstore/rust/reqwest/petstore-async/src/models/nullable_array.rs index 6ddbb5c0ece..a155ea1176a 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async/src/models/nullable_array.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async/src/models/nullable_array.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct NullableArray { diff --git a/samples/client/petstore/rust/reqwest/petstore-async/src/models/optional_testing.rs b/samples/client/petstore/rust/reqwest/petstore-async/src/models/optional_testing.rs index 57d224f831d..72e5a009a62 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async/src/models/optional_testing.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async/src/models/optional_testing.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// OptionalTesting : Test handling of optional and nullable fields #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore-async/src/models/order.rs b/samples/client/petstore/rust/reqwest/petstore-async/src/models/order.rs index 5d16df143aa..e81f64a2980 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async/src/models/order.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async/src/models/order.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// Order : An order for a pets from the pet store #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore-async/src/models/pet.rs b/samples/client/petstore/rust/reqwest/petstore-async/src/models/pet.rs index 59d9a9f1158..785fb5390be 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async/src/models/pet.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async/src/models/pet.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// Pet : A pet for sale in the pet store #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore-async/src/models/property_test.rs b/samples/client/petstore/rust/reqwest/petstore-async/src/models/property_test.rs index 1b92525f28b..c98e7c762b5 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async/src/models/property_test.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async/src/models/property_test.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// PropertyTest : A model to test various formats, e.g. UUID #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore-async/src/models/tag.rs b/samples/client/petstore/rust/reqwest/petstore-async/src/models/tag.rs index 151840c8856..8fe4eebd723 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async/src/models/tag.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async/src/models/tag.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// Tag : A tag for a pet #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore-async/src/models/type_testing.rs b/samples/client/petstore/rust/reqwest/petstore-async/src/models/type_testing.rs index dac3b59eb1f..dba87bdb3cf 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async/src/models/type_testing.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async/src/models/type_testing.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; use serde_with::serde_as; diff --git a/samples/client/petstore/rust/reqwest/petstore-async/src/models/unique_item_array_testing.rs b/samples/client/petstore/rust/reqwest/petstore-async/src/models/unique_item_array_testing.rs index a40f77afc0e..2a1f18ca9ce 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async/src/models/unique_item_array_testing.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async/src/models/unique_item_array_testing.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// UniqueItemArrayTesting : Test handling of enum array with unique items #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore-async/src/models/user.rs b/samples/client/petstore/rust/reqwest/petstore-async/src/models/user.rs index f16b7f785f7..c88c469a4eb 100644 --- a/samples/client/petstore/rust/reqwest/petstore-async/src/models/user.rs +++ b/samples/client/petstore/rust/reqwest/petstore-async/src/models/user.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// User : A User who is purchasing from the pet store #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore-avoid-box/Cargo.toml b/samples/client/petstore/rust/reqwest/petstore-avoid-box/Cargo.toml index 563dd98e2b1..99fe8589bc8 100644 --- a/samples/client/petstore/rust/reqwest/petstore-avoid-box/Cargo.toml +++ b/samples/client/petstore/rust/reqwest/petstore-avoid-box/Cargo.toml @@ -4,15 +4,12 @@ version = "1.0.0" authors = ["OpenAPI Generator team and contributors"] description = "This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters." license = "Apache-2.0" -edition = "2018" +edition = "2021" [dependencies] -serde = "^1.0" -serde_derive = "^1.0" -serde_with = { version = "^3", default-features = false, features = ["base64", "std", "macros"] } +serde = { version = "^1.0", features = ["derive"] } +serde_with = { version = "^3.8", default-features = false, features = ["base64", "std", "macros"] } serde_json = "^1.0" -url = "^2.2" -uuid = { version = "^1.0", features = ["serde", "v4"] } -[dependencies.reqwest] -version = "^0.11" -features = ["json", "multipart"] +url = "^2.5" +uuid = { version = "^1.8", features = ["serde", "v4"] } +reqwest = { version = "^0.12", features = ["json", "multipart"] } diff --git a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/apis/fake_api.rs b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/apis/fake_api.rs index 78d3ba30ec0..3f10b5b6c2a 100644 --- a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/apis/fake_api.rs +++ b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/apis/fake_api.rs @@ -10,7 +10,7 @@ use reqwest; - +use serde::{Deserialize, Serialize}; use crate::{apis::ResponseContent, models}; use super::{Error, configuration}; diff --git a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/apis/pet_api.rs b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/apis/pet_api.rs index ccdefa44be1..0a44b19a32d 100644 --- a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/apis/pet_api.rs +++ b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/apis/pet_api.rs @@ -10,7 +10,7 @@ use reqwest; - +use serde::{Deserialize, Serialize}; use crate::{apis::ResponseContent, models}; use super::{Error, configuration}; diff --git a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/apis/store_api.rs b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/apis/store_api.rs index d08b7b74e46..67fd03a80f5 100644 --- a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/apis/store_api.rs +++ b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/apis/store_api.rs @@ -10,7 +10,7 @@ use reqwest; - +use serde::{Deserialize, Serialize}; use crate::{apis::ResponseContent, models}; use super::{Error, configuration}; diff --git a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/apis/testing_api.rs b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/apis/testing_api.rs index 86f87242fcc..83d1a00fb4c 100644 --- a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/apis/testing_api.rs +++ b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/apis/testing_api.rs @@ -10,7 +10,7 @@ use reqwest; - +use serde::{Deserialize, Serialize}; use crate::{apis::ResponseContent, models}; use super::{Error, configuration}; diff --git a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/apis/user_api.rs b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/apis/user_api.rs index 32594255a63..4f28c21c1cf 100644 --- a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/apis/user_api.rs +++ b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/apis/user_api.rs @@ -10,7 +10,7 @@ use reqwest; - +use serde::{Deserialize, Serialize}; use crate::{apis::ResponseContent, models}; use super::{Error, configuration}; diff --git a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/lib.rs b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/lib.rs index f0d1455a7ff..a1837b966dc 100644 --- a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/lib.rs +++ b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/lib.rs @@ -1,9 +1,6 @@ #![allow(unused_imports)] #![allow(clippy::too_many_arguments)] -#[macro_use] -extern crate serde_derive; - extern crate serde; extern crate serde_json; extern crate url; diff --git a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/action_container.rs b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/action_container.rs index 870b2e3c68b..0dd27c0e5c8 100644 --- a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/action_container.rs +++ b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/action_container.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ActionContainer { diff --git a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/api_response.rs b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/api_response.rs index 4814a31da53..0a60da0f477 100644 --- a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/api_response.rs +++ b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/api_response.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// ApiResponse : Describes the result of uploading an image resource #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/array_item_ref_test.rs b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/array_item_ref_test.rs index 5948b180912..4ac1e8a2fe9 100644 --- a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/array_item_ref_test.rs +++ b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/array_item_ref_test.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// ArrayItemRefTest : Test handling of object reference in arrays #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/baz.rs b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/baz.rs index d2a840a2d67..dcf25d8465a 100644 --- a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/baz.rs +++ b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/baz.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// Baz : Test handling of empty variants /// Test handling of empty variants diff --git a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/category.rs b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/category.rs index 2d2b29334de..9ecf89d354d 100644 --- a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/category.rs +++ b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/category.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// Category : A category for a pet #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/enum_array_testing.rs b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/enum_array_testing.rs index 499c3359513..2ac40c30775 100644 --- a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/enum_array_testing.rs +++ b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/enum_array_testing.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// EnumArrayTesting : Test of enum array #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/model_ref.rs b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/model_ref.rs index cd0928bf9c2..9862cb1a48e 100644 --- a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/model_ref.rs +++ b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/model_ref.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// Ref : using reserved word as model name #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/model_return.rs b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/model_return.rs index 933b644a7f3..07d9268e6e6 100644 --- a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/model_return.rs +++ b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/model_return.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// Return : Test using keywords #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/nullable_array.rs b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/nullable_array.rs index 6ddbb5c0ece..a155ea1176a 100644 --- a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/nullable_array.rs +++ b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/nullable_array.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct NullableArray { diff --git a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/optional_testing.rs b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/optional_testing.rs index 57d224f831d..72e5a009a62 100644 --- a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/optional_testing.rs +++ b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/optional_testing.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// OptionalTesting : Test handling of optional and nullable fields #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/order.rs b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/order.rs index 5d16df143aa..e81f64a2980 100644 --- a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/order.rs +++ b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/order.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// Order : An order for a pets from the pet store #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/pet.rs b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/pet.rs index 1cbe779e1ea..9d5606d017f 100644 --- a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/pet.rs +++ b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/pet.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// Pet : A pet for sale in the pet store #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/property_test.rs b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/property_test.rs index 1b92525f28b..c98e7c762b5 100644 --- a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/property_test.rs +++ b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/property_test.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// PropertyTest : A model to test various formats, e.g. UUID #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/tag.rs b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/tag.rs index 151840c8856..8fe4eebd723 100644 --- a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/tag.rs +++ b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/tag.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// Tag : A tag for a pet #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/type_testing.rs b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/type_testing.rs index dac3b59eb1f..dba87bdb3cf 100644 --- a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/type_testing.rs +++ b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/type_testing.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; use serde_with::serde_as; diff --git a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/unique_item_array_testing.rs b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/unique_item_array_testing.rs index a40f77afc0e..2a1f18ca9ce 100644 --- a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/unique_item_array_testing.rs +++ b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/unique_item_array_testing.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// UniqueItemArrayTesting : Test handling of enum array with unique items #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/user.rs b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/user.rs index f16b7f785f7..c88c469a4eb 100644 --- a/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/user.rs +++ b/samples/client/petstore/rust/reqwest/petstore-avoid-box/src/models/user.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// User : A User who is purchasing from the pet store #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/Cargo.toml b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/Cargo.toml index b15e4c91459..31b50f4eed1 100644 --- a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/Cargo.toml +++ b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/Cargo.toml @@ -4,18 +4,15 @@ version = "1.0.0" authors = ["OpenAPI Generator team and contributors"] description = "This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters." license = "Apache-2.0" -edition = "2018" +edition = "2021" [dependencies] -serde = "^1.0" -serde_derive = "^1.0" -serde_with = { version = "^3", default-features = false, features = ["base64", "std", "macros"] } +serde = { version = "^1.0", features = ["derive"] } +serde_with = { version = "^3.8", default-features = false, features = ["base64", "std", "macros"] } serde_json = "^1.0" -url = "^2.2" -uuid = { version = "^1.0", features = ["serde", "v4"] } +url = "^2.5" +uuid = { version = "^1.8", features = ["serde", "v4"] } aws-sigv4 = "0.3.0" http = "0.2.5" secrecy = "0.8.0" -[dependencies.reqwest] -version = "^0.11" -features = ["json", "blocking", "multipart"] +reqwest = { version = "^0.12", features = ["json", "blocking", "multipart"] } diff --git a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/apis/configuration.rs b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/apis/configuration.rs index e8b030ae01b..f401dc38637 100644 --- a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/apis/configuration.rs +++ b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/apis/configuration.rs @@ -68,7 +68,7 @@ impl AWSv4Key { value.to_str().expect("header value should be a string").to_string())); } } - return Ok(additional_headers); + Ok(additional_headers) } } diff --git a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/apis/fake_api.rs b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/apis/fake_api.rs index af7818dd030..d14a0f233be 100644 --- a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/apis/fake_api.rs +++ b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/apis/fake_api.rs @@ -10,7 +10,7 @@ use reqwest; - +use serde::{Deserialize, Serialize}; use crate::{apis::ResponseContent, models}; use super::{Error, configuration}; diff --git a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/apis/pet_api.rs b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/apis/pet_api.rs index ff120978fc7..c48cfb3b2f9 100644 --- a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/apis/pet_api.rs +++ b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/apis/pet_api.rs @@ -10,7 +10,7 @@ use reqwest; - +use serde::{Deserialize, Serialize}; use crate::{apis::ResponseContent, models}; use super::{Error, configuration}; @@ -140,7 +140,7 @@ pub fn delete_pet(configuration: &configuration::Configuration, pet_id: i64, api let local_var_new_headers = match local_var_aws_v4_key.sign( &local_var_uri_str, "DELETE", - &"", + "", ) { Ok(new_headers) => new_headers, Err(err) => return Err(Error::AWSV4SignatureError(err)), @@ -191,7 +191,7 @@ pub fn find_pets_by_status(configuration: &configuration::Configuration, status: let local_var_new_headers = match local_var_aws_v4_key.sign( &local_var_uri_str, "GET", - &"", + "", ) { Ok(new_headers) => new_headers, Err(err) => return Err(Error::AWSV4SignatureError(err)), @@ -239,7 +239,7 @@ pub fn find_pets_by_tags(configuration: &configuration::Configuration, tags: Vec let local_var_new_headers = match local_var_aws_v4_key.sign( &local_var_uri_str, "GET", - &"", + "", ) { Ok(new_headers) => new_headers, Err(err) => return Err(Error::AWSV4SignatureError(err)), @@ -283,7 +283,7 @@ pub fn get_pet_by_id(configuration: &configuration::Configuration, pet_id: i64) let local_var_new_headers = match local_var_aws_v4_key.sign( &local_var_uri_str, "GET", - &"", + "", ) { Ok(new_headers) => new_headers, Err(err) => return Err(Error::AWSV4SignatureError(err)), @@ -377,7 +377,7 @@ pub fn update_pet_with_form(configuration: &configuration::Configuration, pet_id let local_var_new_headers = match local_var_aws_v4_key.sign( &local_var_uri_str, "POST", - &"", + "", ) { Ok(new_headers) => new_headers, Err(err) => return Err(Error::AWSV4SignatureError(err)), @@ -429,7 +429,7 @@ pub fn upload_file(configuration: &configuration::Configuration, pet_id: i64, ad let local_var_new_headers = match local_var_aws_v4_key.sign( &local_var_uri_str, "POST", - &"", + "", ) { Ok(new_headers) => new_headers, Err(err) => return Err(Error::AWSV4SignatureError(err)), diff --git a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/apis/store_api.rs b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/apis/store_api.rs index 3f42d04d3ec..fd42617f4c7 100644 --- a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/apis/store_api.rs +++ b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/apis/store_api.rs @@ -10,7 +10,7 @@ use reqwest; - +use serde::{Deserialize, Serialize}; use crate::{apis::ResponseContent, models}; use super::{Error, configuration}; @@ -90,7 +90,7 @@ pub fn get_inventory(configuration: &configuration::Configuration, ) -> Result new_headers, Err(err) => return Err(Error::AWSV4SignatureError(err)), diff --git a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/apis/testing_api.rs b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/apis/testing_api.rs index f6bca74913e..c53219078f0 100644 --- a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/apis/testing_api.rs +++ b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/apis/testing_api.rs @@ -10,7 +10,7 @@ use reqwest; - +use serde::{Deserialize, Serialize}; use crate::{apis::ResponseContent, models}; use super::{Error, configuration}; diff --git a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/apis/user_api.rs b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/apis/user_api.rs index b1f475f2a04..0eedaddc2e4 100644 --- a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/apis/user_api.rs +++ b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/apis/user_api.rs @@ -10,7 +10,7 @@ use reqwest; - +use serde::{Deserialize, Serialize}; use crate::{apis::ResponseContent, models}; use super::{Error, configuration}; @@ -246,7 +246,7 @@ pub fn delete_user(configuration: &configuration::Configuration, username: &str) let local_var_new_headers = match local_var_aws_v4_key.sign( &local_var_uri_str, "DELETE", - &"", + "", ) { Ok(new_headers) => new_headers, Err(err) => return Err(Error::AWSV4SignatureError(err)), @@ -353,7 +353,7 @@ pub fn logout_user(configuration: &configuration::Configuration, ) -> Result<(), let local_var_new_headers = match local_var_aws_v4_key.sign( &local_var_uri_str, "GET", - &"", + "", ) { Ok(new_headers) => new_headers, Err(err) => return Err(Error::AWSV4SignatureError(err)), diff --git a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/lib.rs b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/lib.rs index f0d1455a7ff..a1837b966dc 100644 --- a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/lib.rs +++ b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/lib.rs @@ -1,9 +1,6 @@ #![allow(unused_imports)] #![allow(clippy::too_many_arguments)] -#[macro_use] -extern crate serde_derive; - extern crate serde; extern crate serde_json; extern crate url; diff --git a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/action_container.rs b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/action_container.rs index 81cca99e8ac..11d2f0b8712 100644 --- a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/action_container.rs +++ b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/action_container.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ActionContainer { diff --git a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/api_response.rs b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/api_response.rs index 4814a31da53..0a60da0f477 100644 --- a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/api_response.rs +++ b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/api_response.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// ApiResponse : Describes the result of uploading an image resource #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/array_item_ref_test.rs b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/array_item_ref_test.rs index 5948b180912..4ac1e8a2fe9 100644 --- a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/array_item_ref_test.rs +++ b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/array_item_ref_test.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// ArrayItemRefTest : Test handling of object reference in arrays #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/baz.rs b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/baz.rs index d2a840a2d67..dcf25d8465a 100644 --- a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/baz.rs +++ b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/baz.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// Baz : Test handling of empty variants /// Test handling of empty variants diff --git a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/category.rs b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/category.rs index 2d2b29334de..9ecf89d354d 100644 --- a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/category.rs +++ b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/category.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// Category : A category for a pet #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/enum_array_testing.rs b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/enum_array_testing.rs index 499c3359513..2ac40c30775 100644 --- a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/enum_array_testing.rs +++ b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/enum_array_testing.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// EnumArrayTesting : Test of enum array #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/model_ref.rs b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/model_ref.rs index cd0928bf9c2..9862cb1a48e 100644 --- a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/model_ref.rs +++ b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/model_ref.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// Ref : using reserved word as model name #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/model_return.rs b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/model_return.rs index 933b644a7f3..07d9268e6e6 100644 --- a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/model_return.rs +++ b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/model_return.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// Return : Test using keywords #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/nullable_array.rs b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/nullable_array.rs index 6ddbb5c0ece..a155ea1176a 100644 --- a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/nullable_array.rs +++ b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/nullable_array.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct NullableArray { diff --git a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/optional_testing.rs b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/optional_testing.rs index 57d224f831d..72e5a009a62 100644 --- a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/optional_testing.rs +++ b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/optional_testing.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// OptionalTesting : Test handling of optional and nullable fields #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/order.rs b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/order.rs index 5d16df143aa..e81f64a2980 100644 --- a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/order.rs +++ b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/order.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// Order : An order for a pets from the pet store #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/pet.rs b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/pet.rs index 59d9a9f1158..785fb5390be 100644 --- a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/pet.rs +++ b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/pet.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// Pet : A pet for sale in the pet store #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/property_test.rs b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/property_test.rs index 1b92525f28b..c98e7c762b5 100644 --- a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/property_test.rs +++ b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/property_test.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// PropertyTest : A model to test various formats, e.g. UUID #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/tag.rs b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/tag.rs index 151840c8856..8fe4eebd723 100644 --- a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/tag.rs +++ b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/tag.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// Tag : A tag for a pet #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/type_testing.rs b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/type_testing.rs index dac3b59eb1f..dba87bdb3cf 100644 --- a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/type_testing.rs +++ b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/type_testing.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; use serde_with::serde_as; diff --git a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/unique_item_array_testing.rs b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/unique_item_array_testing.rs index a40f77afc0e..2a1f18ca9ce 100644 --- a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/unique_item_array_testing.rs +++ b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/unique_item_array_testing.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// UniqueItemArrayTesting : Test handling of enum array with unique items #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/user.rs b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/user.rs index f16b7f785f7..c88c469a4eb 100644 --- a/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/user.rs +++ b/samples/client/petstore/rust/reqwest/petstore-awsv4signature/src/models/user.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// User : A User who is purchasing from the pet store #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore/Cargo.toml b/samples/client/petstore/rust/reqwest/petstore/Cargo.toml index 5ec1e2d4130..5e0e14f5120 100644 --- a/samples/client/petstore/rust/reqwest/petstore/Cargo.toml +++ b/samples/client/petstore/rust/reqwest/petstore/Cargo.toml @@ -4,15 +4,12 @@ version = "1.0.0" authors = ["OpenAPI Generator team and contributors"] description = "This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters." license = "Apache-2.0" -edition = "2018" +edition = "2021" [dependencies] -serde = "^1.0" -serde_derive = "^1.0" -serde_with = { version = "^3", default-features = false, features = ["base64", "std", "macros"] } +serde = { version = "^1.0", features = ["derive"] } +serde_with = { version = "^3.8", default-features = false, features = ["base64", "std", "macros"] } serde_json = "^1.0" -url = "^2.2" -uuid = { version = "^1.0", features = ["serde", "v4"] } -[dependencies.reqwest] -version = "^0.11" -features = ["json", "blocking", "multipart"] +url = "^2.5" +uuid = { version = "^1.8", features = ["serde", "v4"] } +reqwest = { version = "^0.12", features = ["json", "blocking", "multipart"] } diff --git a/samples/client/petstore/rust/reqwest/petstore/src/apis/fake_api.rs b/samples/client/petstore/rust/reqwest/petstore/src/apis/fake_api.rs index af7818dd030..d14a0f233be 100644 --- a/samples/client/petstore/rust/reqwest/petstore/src/apis/fake_api.rs +++ b/samples/client/petstore/rust/reqwest/petstore/src/apis/fake_api.rs @@ -10,7 +10,7 @@ use reqwest; - +use serde::{Deserialize, Serialize}; use crate::{apis::ResponseContent, models}; use super::{Error, configuration}; diff --git a/samples/client/petstore/rust/reqwest/petstore/src/apis/pet_api.rs b/samples/client/petstore/rust/reqwest/petstore/src/apis/pet_api.rs index 70dec4dca24..ebff8f8dde9 100644 --- a/samples/client/petstore/rust/reqwest/petstore/src/apis/pet_api.rs +++ b/samples/client/petstore/rust/reqwest/petstore/src/apis/pet_api.rs @@ -10,7 +10,7 @@ use reqwest; - +use serde::{Deserialize, Serialize}; use crate::{apis::ResponseContent, models}; use super::{Error, configuration}; diff --git a/samples/client/petstore/rust/reqwest/petstore/src/apis/store_api.rs b/samples/client/petstore/rust/reqwest/petstore/src/apis/store_api.rs index a29eba98354..98c889e0e55 100644 --- a/samples/client/petstore/rust/reqwest/petstore/src/apis/store_api.rs +++ b/samples/client/petstore/rust/reqwest/petstore/src/apis/store_api.rs @@ -10,7 +10,7 @@ use reqwest; - +use serde::{Deserialize, Serialize}; use crate::{apis::ResponseContent, models}; use super::{Error, configuration}; diff --git a/samples/client/petstore/rust/reqwest/petstore/src/apis/testing_api.rs b/samples/client/petstore/rust/reqwest/petstore/src/apis/testing_api.rs index f6bca74913e..c53219078f0 100644 --- a/samples/client/petstore/rust/reqwest/petstore/src/apis/testing_api.rs +++ b/samples/client/petstore/rust/reqwest/petstore/src/apis/testing_api.rs @@ -10,7 +10,7 @@ use reqwest; - +use serde::{Deserialize, Serialize}; use crate::{apis::ResponseContent, models}; use super::{Error, configuration}; diff --git a/samples/client/petstore/rust/reqwest/petstore/src/apis/user_api.rs b/samples/client/petstore/rust/reqwest/petstore/src/apis/user_api.rs index ec400432aae..2f328ace605 100644 --- a/samples/client/petstore/rust/reqwest/petstore/src/apis/user_api.rs +++ b/samples/client/petstore/rust/reqwest/petstore/src/apis/user_api.rs @@ -10,7 +10,7 @@ use reqwest; - +use serde::{Deserialize, Serialize}; use crate::{apis::ResponseContent, models}; use super::{Error, configuration}; diff --git a/samples/client/petstore/rust/reqwest/petstore/src/lib.rs b/samples/client/petstore/rust/reqwest/petstore/src/lib.rs index f0d1455a7ff..a1837b966dc 100644 --- a/samples/client/petstore/rust/reqwest/petstore/src/lib.rs +++ b/samples/client/petstore/rust/reqwest/petstore/src/lib.rs @@ -1,9 +1,6 @@ #![allow(unused_imports)] #![allow(clippy::too_many_arguments)] -#[macro_use] -extern crate serde_derive; - extern crate serde; extern crate serde_json; extern crate url; diff --git a/samples/client/petstore/rust/reqwest/petstore/src/models/action_container.rs b/samples/client/petstore/rust/reqwest/petstore/src/models/action_container.rs index 81cca99e8ac..11d2f0b8712 100644 --- a/samples/client/petstore/rust/reqwest/petstore/src/models/action_container.rs +++ b/samples/client/petstore/rust/reqwest/petstore/src/models/action_container.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct ActionContainer { diff --git a/samples/client/petstore/rust/reqwest/petstore/src/models/api_response.rs b/samples/client/petstore/rust/reqwest/petstore/src/models/api_response.rs index 4814a31da53..0a60da0f477 100644 --- a/samples/client/petstore/rust/reqwest/petstore/src/models/api_response.rs +++ b/samples/client/petstore/rust/reqwest/petstore/src/models/api_response.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// ApiResponse : Describes the result of uploading an image resource #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore/src/models/array_item_ref_test.rs b/samples/client/petstore/rust/reqwest/petstore/src/models/array_item_ref_test.rs index 5948b180912..4ac1e8a2fe9 100644 --- a/samples/client/petstore/rust/reqwest/petstore/src/models/array_item_ref_test.rs +++ b/samples/client/petstore/rust/reqwest/petstore/src/models/array_item_ref_test.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// ArrayItemRefTest : Test handling of object reference in arrays #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore/src/models/baz.rs b/samples/client/petstore/rust/reqwest/petstore/src/models/baz.rs index d2a840a2d67..dcf25d8465a 100644 --- a/samples/client/petstore/rust/reqwest/petstore/src/models/baz.rs +++ b/samples/client/petstore/rust/reqwest/petstore/src/models/baz.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// Baz : Test handling of empty variants /// Test handling of empty variants diff --git a/samples/client/petstore/rust/reqwest/petstore/src/models/category.rs b/samples/client/petstore/rust/reqwest/petstore/src/models/category.rs index 2d2b29334de..9ecf89d354d 100644 --- a/samples/client/petstore/rust/reqwest/petstore/src/models/category.rs +++ b/samples/client/petstore/rust/reqwest/petstore/src/models/category.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// Category : A category for a pet #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore/src/models/enum_array_testing.rs b/samples/client/petstore/rust/reqwest/petstore/src/models/enum_array_testing.rs index 499c3359513..2ac40c30775 100644 --- a/samples/client/petstore/rust/reqwest/petstore/src/models/enum_array_testing.rs +++ b/samples/client/petstore/rust/reqwest/petstore/src/models/enum_array_testing.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// EnumArrayTesting : Test of enum array #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore/src/models/model_ref.rs b/samples/client/petstore/rust/reqwest/petstore/src/models/model_ref.rs index cd0928bf9c2..9862cb1a48e 100644 --- a/samples/client/petstore/rust/reqwest/petstore/src/models/model_ref.rs +++ b/samples/client/petstore/rust/reqwest/petstore/src/models/model_ref.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// Ref : using reserved word as model name #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore/src/models/model_return.rs b/samples/client/petstore/rust/reqwest/petstore/src/models/model_return.rs index 933b644a7f3..07d9268e6e6 100644 --- a/samples/client/petstore/rust/reqwest/petstore/src/models/model_return.rs +++ b/samples/client/petstore/rust/reqwest/petstore/src/models/model_return.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// Return : Test using keywords #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore/src/models/nullable_array.rs b/samples/client/petstore/rust/reqwest/petstore/src/models/nullable_array.rs index 6ddbb5c0ece..a155ea1176a 100644 --- a/samples/client/petstore/rust/reqwest/petstore/src/models/nullable_array.rs +++ b/samples/client/petstore/rust/reqwest/petstore/src/models/nullable_array.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] pub struct NullableArray { diff --git a/samples/client/petstore/rust/reqwest/petstore/src/models/optional_testing.rs b/samples/client/petstore/rust/reqwest/petstore/src/models/optional_testing.rs index 57d224f831d..72e5a009a62 100644 --- a/samples/client/petstore/rust/reqwest/petstore/src/models/optional_testing.rs +++ b/samples/client/petstore/rust/reqwest/petstore/src/models/optional_testing.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// OptionalTesting : Test handling of optional and nullable fields #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore/src/models/order.rs b/samples/client/petstore/rust/reqwest/petstore/src/models/order.rs index d27d4f8893e..a66e7dbb568 100644 --- a/samples/client/petstore/rust/reqwest/petstore/src/models/order.rs +++ b/samples/client/petstore/rust/reqwest/petstore/src/models/order.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// Order : An order for a pets from the pet store #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore/src/models/pet.rs b/samples/client/petstore/rust/reqwest/petstore/src/models/pet.rs index 59d9a9f1158..785fb5390be 100644 --- a/samples/client/petstore/rust/reqwest/petstore/src/models/pet.rs +++ b/samples/client/petstore/rust/reqwest/petstore/src/models/pet.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// Pet : A pet for sale in the pet store #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore/src/models/property_test.rs b/samples/client/petstore/rust/reqwest/petstore/src/models/property_test.rs index 1b92525f28b..c98e7c762b5 100644 --- a/samples/client/petstore/rust/reqwest/petstore/src/models/property_test.rs +++ b/samples/client/petstore/rust/reqwest/petstore/src/models/property_test.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// PropertyTest : A model to test various formats, e.g. UUID #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore/src/models/tag.rs b/samples/client/petstore/rust/reqwest/petstore/src/models/tag.rs index 151840c8856..8fe4eebd723 100644 --- a/samples/client/petstore/rust/reqwest/petstore/src/models/tag.rs +++ b/samples/client/petstore/rust/reqwest/petstore/src/models/tag.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// Tag : A tag for a pet #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore/src/models/type_testing.rs b/samples/client/petstore/rust/reqwest/petstore/src/models/type_testing.rs index dac3b59eb1f..dba87bdb3cf 100644 --- a/samples/client/petstore/rust/reqwest/petstore/src/models/type_testing.rs +++ b/samples/client/petstore/rust/reqwest/petstore/src/models/type_testing.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; use serde_with::serde_as; diff --git a/samples/client/petstore/rust/reqwest/petstore/src/models/unique_item_array_testing.rs b/samples/client/petstore/rust/reqwest/petstore/src/models/unique_item_array_testing.rs index a40f77afc0e..2a1f18ca9ce 100644 --- a/samples/client/petstore/rust/reqwest/petstore/src/models/unique_item_array_testing.rs +++ b/samples/client/petstore/rust/reqwest/petstore/src/models/unique_item_array_testing.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// UniqueItemArrayTesting : Test handling of enum array with unique items #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/client/petstore/rust/reqwest/petstore/src/models/user.rs b/samples/client/petstore/rust/reqwest/petstore/src/models/user.rs index f16b7f785f7..c88c469a4eb 100644 --- a/samples/client/petstore/rust/reqwest/petstore/src/models/user.rs +++ b/samples/client/petstore/rust/reqwest/petstore/src/models/user.rs @@ -9,6 +9,7 @@ */ use crate::models; +use serde::{Deserialize, Serialize}; /// User : A User who is purchasing from the pet store #[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)] diff --git a/samples/server/petstore/rust-server/Cargo.toml b/samples/server/petstore/rust-server/Cargo.toml index 68d06c54103..c086d1f0138 100644 --- a/samples/server/petstore/rust-server/Cargo.toml +++ b/samples/server/petstore/rust-server/Cargo.toml @@ -1,2 +1,3 @@ [workspace] members = ["output/*"] +resolver = "2" 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 de78c375dc0..60992d137b8 100644 --- a/samples/server/petstore/rust-server/output/multipart-v3/Cargo.toml +++ b/samples/server/petstore/rust-server/output/multipart-v3/Cargo.toml @@ -5,7 +5,7 @@ authors = ["OpenAPI Generator team and contributors"] description = "API under test" # Override this license by providing a License Object in the OpenAPI. license = "Unlicense" -edition = "2018" +edition = "2021" [features] default = ["client", "server"] 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 95fe3c653d2..94c1dfcf421 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 @@ -5,7 +5,7 @@ authors = ["OpenAPI Generator team and contributors"] description = "No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)" # Override this license by providing a License Object in the OpenAPI. license = "Unlicense" -edition = "2018" +edition = "2021" [features] default = ["client", "server"] 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 f43c739c778..dd0059807bb 100644 --- a/samples/server/petstore/rust-server/output/openapi-v3/Cargo.toml +++ b/samples/server/petstore/rust-server/output/openapi-v3/Cargo.toml @@ -5,7 +5,7 @@ authors = ["OpenAPI Generator team and contributors"] description = "API under test" # Override this license by providing a License Object in the OpenAPI. license = "Unlicense" -edition = "2018" +edition = "2021" [features] default = ["client", "server"] 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 27a63250cf4..75d7eba1f3e 100644 --- a/samples/server/petstore/rust-server/output/ops-v3/Cargo.toml +++ b/samples/server/petstore/rust-server/output/ops-v3/Cargo.toml @@ -5,7 +5,7 @@ authors = ["OpenAPI Generator team and contributors"] description = "No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)" # Override this license by providing a License Object in the OpenAPI. license = "Unlicense" -edition = "2018" +edition = "2021" [features] default = ["client", "server"] 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 abfbb677510..4907e0db9aa 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 @@ -4,7 +4,7 @@ version = "1.0.0" authors = ["OpenAPI Generator team and contributors"] description = "This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\" license = "Apache-2.0" -edition = "2018" +edition = "2021" publish = ["crates-io"] [features] 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 4a9f77118d2..97c08a3b740 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 @@ -5,7 +5,7 @@ authors = ["OpenAPI Generator team and contributors"] description = "No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)" # Override this license by providing a License Object in the OpenAPI. license = "Unlicense" -edition = "2018" +edition = "2021" [features] default = ["client", "server"] 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 fc7a9533931..fb4de1e4651 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 @@ -5,7 +5,7 @@ authors = ["OpenAPI Generator team and contributors"] description = "This spec is for testing rust-server-specific things" # Override this license by providing a License Object in the OpenAPI. license = "Unlicense" -edition = "2018" +edition = "2021" [features] default = ["client", "server"]