[Rust][Client] Unify sync/async client structure

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustClientCodegen.java

@@ -301,9 +301,6 @@ public void processOpts() {
         if (HYPER_LIBRARY.equals(getLibrary())) {
             supportingFiles.add(new SupportingFile("request.rs", apiFolder, "request.rs"));
         }
-        if (!getSupportAsync()) { // for sync only
-            supportingFiles.add(new SupportingFile(getLibrary() + "/client.mustache", apiFolder, "client.rs"));
-        }
     }
 
     private boolean getSupportAsync() {

modules/openapi-generator/src/main/resources/rust/reqwest/api_mod.mustache

@@ -44,7 +44,4 @@ pub mod {{{classFilename}}};
 {{/apis}}
 {{/apiInfo}}
 
-{{^supportAsync}}
-pub mod client;
-{{/supportAsync}}
 pub mod configuration;

samples/client/petstore/rust/reqwest/fileResponseTest/.openapi-generator/FILES

@@ -4,7 +4,6 @@ Cargo.toml
 README.md
 docs/DefaultApi.md
 git_push.sh
-src/apis/client.rs
 src/apis/configuration.rs
 src/apis/default_api.rs
 src/apis/mod.rs

samples/client/petstore/rust/reqwest/fileResponseTest/src/apis/default_api.rs

@@ -8,28 +8,12 @@
  * Generated by: https://openapi-generator.tech
  */
 
-#[allow(unused_imports)]
-use std::rc::Rc;
-use std::borrow::Borrow;
-use std::option::Option;
 
 use reqwest;
 
 use crate::apis::ResponseContent;
 use super::{Error, configuration};
 
-pub struct DefaultApiClient {
-    configuration: Rc<configuration::Configuration>,
-}
-
-impl DefaultApiClient {
-    pub fn new(configuration: Rc<configuration::Configuration>) -> DefaultApiClient {
-        DefaultApiClient {
-            configuration,
-        }
-    }
-}
-
 
 /// struct for typed errors of method `fileresponsetest`
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -39,35 +23,29 @@ pub enum FileresponsetestError {
 }
 
 
-pub trait DefaultApi {
-    fn fileresponsetest(&self, ) -> Result<std::path::PathBuf, Error<FileresponsetestError>>;
-}
+pub fn fileresponsetest(configuration: &configuration::Configuration, ) -> Result<std::path::PathBuf, Error<FileresponsetestError>> {
 
-impl DefaultApi for DefaultApiClient {
-    fn fileresponsetest(&self, ) -> Result<std::path::PathBuf, Error<FileresponsetestError>> {
-        let configuration: &configuration::Configuration = self.configuration.borrow();
-        let client = &configuration.client;
+    let client = &configuration.client;
 
-        let uri_str = format!("{}/tests/fileResponse", configuration.base_path);
-        let mut req_builder = client.get(uri_str.as_str());
+    let uri_str = format!("{}/tests/fileResponse", configuration.base_path);
+    let mut req_builder = client.get(uri_str.as_str());
 
-        if let Some(ref user_agent) = configuration.user_agent {
-            req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
-        }
+    if let Some(ref user_agent) = configuration.user_agent {
+        req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
+    }
 
-        let req = req_builder.build()?;
-        let mut resp = client.execute(req)?;
+    let req = req_builder.build()?;
+    let mut resp = client.execute(req)?;
 
-        let status = resp.status();
-        let content = resp.text()?;
+    let status = resp.status();
+    let content = resp.text()?;
 
-        if status.is_success() {
-            serde_json::from_str(&content).map_err(Error::from)
-        } else {
-            let entity: Option<FileresponsetestError> = serde_json::from_str(&content).ok();
-            let error = ResponseContent { status, content, entity };
-            Err(Error::ResponseError(error))
-        }
+    if status.is_success() {
+        serde_json::from_str(&content).map_err(Error::from)
+    } else {
+        let entity: Option<FileresponsetestError> = serde_json::from_str(&content).ok();
+        let error = ResponseContent { status, content, entity };
+        Err(Error::ResponseError(error))
     }
-
 }
+

samples/client/petstore/rust/reqwest/fileResponseTest/src/apis/mod.rs

@@ -40,5 +40,4 @@ pub fn urlencode<T: AsRef<str>>(s: T) -> String {
 
 pub mod default_api;
 
-pub mod client;
 pub mod configuration;