[Rust] Make Rust gen slightly more idiomatic

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/RustClientCodegen.java

@@ -51,17 +51,17 @@ public RustClientCodegen() {
 
         setReservedWordsLowerCase(
             Arrays.asList(
-				"abstract", "alignof", "as", "become", "box",
-				"break", "const", "continue", "crate", "do",
-				"else", "enum", "extern", "false", "final",
-				"fn", "for", "if", "impl", "in",
-				"let", "loop", "macro", "match", "mod",
-				"move", "mut", "offsetof", "override", "priv",
-				"proc", "pub", "pure", "ref", "return",
-				"Self", "self", "sizeof", "static", "struct",
-				"super", "trait", "true", "type", "typeof",
-				"unsafe", "unsized", "use", "virtual", "where",
-				"while", "yield"
+                "abstract", "alignof", "as", "become", "box",
+                "break", "const", "continue", "crate", "do",
+                "else", "enum", "extern", "false", "final",
+                "fn", "for", "if", "impl", "in",
+                "let", "loop", "macro", "match", "mod",
+                "move", "mut", "offsetof", "override", "priv",
+                "proc", "pub", "pure", "ref", "return",
+                "Self", "self", "sizeof", "static", "struct",
+                "super", "trait", "true", "type", "typeof",
+                "unsafe", "unsized", "use", "virtual", "where",
+                "while", "yield"
             )
         );
 
@@ -73,10 +73,10 @@ public RustClientCodegen() {
 
         languageSpecificPrimitives = new HashSet<String>(
             Arrays.asList(
-				"i8", "i16", "i32", "i64",
-				"u8", "u16", "u32", "u64",
-				"f32", "f64",
-				"char", "bool", "String", "Vec<u8>", "File")
+                "i8", "i16", "i32", "i64",
+                "u8", "u16", "u32", "u64",
+                "f32", "f64",
+                "char", "bool", "String", "Vec<u8>", "File")
             );
 
         instantiationTypes.clear();
@@ -386,7 +386,7 @@ public Map<String, Object> postProcessOperations(Map<String, Object> objs) {
                         p.dataType = "::std::collections::HashMap<String, super::" + rt.substring("::std::collections::HashMap<String, ".length(), end).trim() + ">";
                     }
                 } else if (!languageSpecificPrimitives.contains(p.dataType)) {
-					// add super:: to model, e.g. super::pet
+                    // add super:: to model, e.g. super::pet
                     p.dataType = "super::" + p.dataType;
                 }
             }*/

modules/swagger-codegen/src/main/resources/rust/README.mustache

@@ -1,4 +1,4 @@
-# Go API client for {{packageName}}
+# Rust API client for {{packageName}}
 
 {{#appDescription}}
 {{{appDescription}}}

modules/swagger-codegen/src/main/resources/rust/api.mustache

@@ -9,13 +9,13 @@ use futures::{Future, Stream};
 
 use super::{Error, configuration};
 
-pub struct {{{classname}}}Impl<C: hyper::client::Connect> {
+pub struct {{{classname}}}Client<C: hyper::client::Connect> {
     configuration: Rc<configuration::Configuration<C>>,
 }
 
-impl<C: hyper::client::Connect> {{{classname}}}Impl<C> {
-    pub fn new(configuration: Rc<configuration::Configuration<C>>) -> {{{classname}}}Impl<C> {
-        {{{classname}}}Impl {
+impl<C: hyper::client::Connect> {{{classname}}}Client<C> {
+    pub fn new(configuration: Rc<configuration::Configuration<C>>) -> {{{classname}}}Client<C> {
+        {{{classname}}}Client {
             configuration: configuration,
         }
     }
@@ -30,7 +30,7 @@ pub trait {{classname}} {
 }
 
 
-impl<C: hyper::client::Connect>{{classname}} for {{classname}}Impl<C> {
+impl<C: hyper::client::Connect>{{classname}} for {{classname}}Client<C> {
 {{#operations}}
 {{#operation}}
     fn {{{operationId}}}(&self, {{#allParams}}{{paramName}}: {{#isString}}&str{{/isString}}{{^isString}}{{^isPrimitiveType}}{{^isContainer}}::models::{{/isContainer}}{{/isPrimitiveType}}{{{dataType}}}{{/isString}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) -> Box<Future<Item = {{^returnType}}(){{/returnType}}{{#returnType}}{{{.}}}{{/returnType}}, Error = Error>> {

modules/swagger-codegen/src/main/resources/rust/api_mod.mustache

@@ -27,8 +27,7 @@ mod {{classFilename}};
 {{#operations}}
 {{#operation}}
 {{#-last}}
-pub use self::{{classFilename}}::{{classname}};
-pub use self::{{classFilename}}::{{classname}}Impl;
+pub use self::{{classFilename}}::{ {{classname}}, {{classname}}Client };
 {{/-last}}
 {{/operation}}
 {{/operations}}

modules/swagger-codegen/src/main/resources/rust/client.mustache

@@ -21,15 +21,15 @@ pub struct APIClient<C: hyper::client::Connect> {
 impl<C: hyper::client::Connect> APIClient<C> {
   pub fn new(configuration: Configuration<C>) -> APIClient<C> {
     let rc = Rc::new(configuration);
-    
+
     APIClient {
       configuration: rc.clone(),
 {{#apiInfo}}
 {{#apis}}
 {{#operations}}
 {{#operation}}
       {{#-last}}
-      {{classFilename}}: Box::new(::apis::{{classname}}Impl::new(rc.clone())),
+      {{classFilename}}: Box::new(::apis::{{classname}}Client::new(rc.clone())),
       {{/-last}}
 {{/operation}}
 {{/operations}}

samples/client/petstore/rust/README.md

@@ -1,4 +1,4 @@
-# Go API client for swagger
+# Rust API client for swagger
 
 This is a sample server Petstore server.  You can find out more about Swagger at [http://swagger.io](http://swagger.io) or on [irc.freenode.net, #swagger](http://swagger.io/irc/).  For this sample, you can use the api key `special-key` to test the authorization filters.
 

samples/client/petstore/rust/docs/Pet.md

@@ -4,10 +4,10 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **id** | **i64** |  | [optional] [default to null]
-**category** | [***::models::category::Category**](Category.md) |  | [optional] [default to null]
+**category** | [***::models::Category**](Category.md) |  | [optional] [default to null]
 **name** | **String** |  | [default to null]
 **photo_urls** | **Vec<String>** |  | [default to null]
-**tags** | [**Vec<::models::tag::Tag>**](Tag.md) |  | [optional] [default to null]
+**tags** | [**Vec<::models::Tag>**](Tag.md) |  | [optional] [default to null]
 **status** | **String** | pet status in the store | [optional] [default to null]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

samples/client/petstore/rust/docs/PetApi.md

@@ -80,7 +80,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **FindPetsByStatus**
-> Vec<::models::pet::Pet> FindPetsByStatus(ctx, status)
+> Vec<::models::Pet> FindPetsByStatus(ctx, status)
 Finds Pets by status
 
 Multiple status values can be provided with comma separated strings
@@ -94,7 +94,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**Vec<::models::pet::Pet>**](Pet.md)
+[**Vec<::models::Pet>**](Pet.md)
 
 ### Authorization
 
@@ -108,7 +108,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **FindPetsByTags**
-> Vec<::models::pet::Pet> FindPetsByTags(ctx, tags)
+> Vec<::models::Pet> FindPetsByTags(ctx, tags)
 Finds Pets by tags
 
 Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
@@ -122,7 +122,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**Vec<::models::pet::Pet>**](Pet.md)
+[**Vec<::models::Pet>**](Pet.md)
 
 ### Authorization
 
@@ -136,7 +136,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **GetPetById**
-> ::models::pet::Pet GetPetById(ctx, pet_id)
+> ::models::Pet GetPetById(ctx, pet_id)
 Find pet by ID
 
 Returns a single pet
@@ -150,7 +150,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**::models::pet::Pet**](Pet.md)
+[**::models::Pet**](Pet.md)
 
 ### Authorization
 
@@ -230,7 +230,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **UploadFile**
-> ::models::api_response::ApiResponse UploadFile(ctx, pet_id, optional)
+> ::models::ApiResponse UploadFile(ctx, pet_id, optional)
 uploads an image
 
 
@@ -254,7 +254,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**::models::api_response::ApiResponse**](ApiResponse.md)
+[**::models::ApiResponse**](ApiResponse.md)
 
 ### Authorization
 

samples/client/petstore/rust/docs/StoreApi.md

@@ -62,7 +62,7 @@ This endpoint does not need any parameter.
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **GetOrderById**
-> ::models::order::Order GetOrderById(order_id)
+> ::models::Order GetOrderById(order_id)
 Find purchase order by ID
 
 For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
@@ -75,7 +75,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**::models::order::Order**](Order.md)
+[**::models::Order**](Order.md)
 
 ### Authorization
 
@@ -89,7 +89,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **PlaceOrder**
-> ::models::order::Order PlaceOrder(body)
+> ::models::Order PlaceOrder(body)
 Place an order for a pet
 
 
@@ -102,7 +102,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**::models::order::Order**](Order.md)
+[**::models::Order**](Order.md)
 
 ### Authorization
 

samples/client/petstore/rust/docs/UserApi.md

@@ -51,7 +51,7 @@ Creates list of users with given input array
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
-  **body** | [**Vec<::models::user::User>**](User.md)| List of user object | 
+  **body** | [**Vec<::models::User>**](User.md)| List of user object | 
 
 ### Return type
 
@@ -78,7 +78,7 @@ Creates list of users with given input array
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
-  **body** | [**Vec<::models::user::User>**](User.md)| List of user object | 
+  **body** | [**Vec<::models::User>**](User.md)| List of user object | 
 
 ### Return type
 
@@ -123,7 +123,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **GetUserByName**
-> ::models::user::User GetUserByName(username)
+> ::models::User GetUserByName(username)
 Get user by user name
 
 
@@ -136,7 +136,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**::models::user::User**](User.md)
+[**::models::User**](User.md)
 
 ### Authorization