Bump Rust edition to 2021 and a few crates

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}}

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}}

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<http::Error> for Error {
     fn from(e: http::Error) -> Self {
-        return Error::Http(e)
+        Error::Http(e)
     }
 }
 
 impl From<hyper::Error> for Error {
     fn from(e: hyper::Error) -> Self {
-        return Error::Hyper(e)
+        Error::Hyper(e)
     }
 }
 
 impl From<serde_json::Error> for Error {
     fn from(e: serde_json::Error) -> Self {
-        return Error::Serde(e)
+        Error::Serde(e)
     }
 }
 

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;

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}}

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,

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}}

samples/client/others/rust/Cargo.toml

@@ -1,2 +1,3 @@
 [workspace]
 members = ["hyper/*", "reqwest/*", "reqwest-regression-16119"]
+resolver = "2"

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"

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<http::Error> for Error {
     fn from(e: http::Error) -> Self {
-        return Error::Http(e)
+        Error::Http(e)
     }
 }
 
 impl From<hyper::Error> for Error {
     fn from(e: hyper::Error) -> Self {
-        return Error::Hyper(e)
+        Error::Hyper(e)
     }
 }
 
 impl From<serde_json::Error> for Error {
     fn from(e: serde_json::Error) -> Self {
-        return Error::Serde(e)
+        Error::Serde(e)
     }
 }
 

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;

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)]

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"

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<http::Error> for Error {
     fn from(e: http::Error) -> Self {
-        return Error::Http(e)
+        Error::Http(e)
     }
 }
 
 impl From<hyper::Error> for Error {
     fn from(e: hyper::Error) -> Self {
-        return Error::Hyper(e)
+        Error::Hyper(e)
     }
 }
 
 impl From<serde_json::Error> for Error {
     fn from(e: serde_json::Error) -> Self {
-        return Error::Serde(e)
+        Error::Serde(e)
     }
 }
 

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;

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")]

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")]

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")]

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")]

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 {

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 {

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 {

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 {

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"

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<http::Error> for Error {
     fn from(e: http::Error) -> Self {
-        return Error::Http(e)
+        Error::Http(e)
     }
 }
 
 impl From<hyper::Error> for Error {
     fn from(e: hyper::Error) -> Self {
-        return Error::Hyper(e)
+        Error::Hyper(e)
     }
 }
 
 impl From<serde_json::Error> for Error {
     fn from(e: serde_json::Error) -> Self {
-        return Error::Serde(e)
+        Error::Serde(e)
     }
 }
 

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;

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 {

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"