Skip to content

Rust generator #6114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wing328 merged 6 commits into from
Jul 19, 2017
Merged

Rust generator #6114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e759621
Convert String to &str in trait definition
Jul 19, 2017
fa6cb0f
Only pass pathParams to uri builder
Jul 19, 2017
9e4ae03
Fixed the html escaping in return type
Jul 19, 2017
9bdb646
Fixed the hashmap constructor
Jul 19, 2017
3555d54
Added models into API scope
Jul 19, 2017
c142e46
removed models subimport, reference from super
Jul 19, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions modules/swagger-codegen/src/main/resources/rust/api.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use serde_json;
use futures;
use futures::{Future, Stream};

use super::{Error, configuration, models};
use super::{Error, configuration};

pub struct {{{classname}}}Impl<C: hyper::client::Connect> {
configuration: Rc<configuration::Configuration<C>>,
Expand All @@ -24,7 +24,7 @@ impl<C: hyper::client::Connect> {{{classname}}}Impl<C> {
pub trait {{classname}} {
{{#operations}}
{{#operation}}
fn {{{operationId}}}(&self, {{#allParams}}{{paramName}}: {{{dataType}}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) -> Box<Future<Item = {{^returnType}}(){{/returnType}}{{#returnType}}{{{returnType}}}{{/returnType}}, Error = Error>>;
fn {{{operationId}}}(&self, {{#allParams}}{{paramName}}: {{#isString}}&str{{/isString}}{{^isString}}{{{dataType}}}{{/isString}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) -> Box<Future<Item = {{^returnType}}(){{/returnType}}{{#returnType}}{{{returnType}}}{{/returnType}}, Error = Error>>;
{{/operation}}
{{/operations}}
}
Expand All @@ -39,15 +39,15 @@ impl<C: hyper::client::Connect>{{classname}} for {{classname}}Impl<C> {
let method = hyper::Method::{{httpMethod}};

{{^hasQueryParams}}
let uri = format!("{}{{{path}}}", configuration.base_path{{#allParams}}, "{{baseName}}"={{paramName}}{{/allParams}}));
let uri = format!("{}{{{path}}}", configuration.base_path{{#pathParams}}, {{baseName}}={{paramName}}{{/pathParams}});
{{/hasQueryParams}}
{{#hasQueryParams}}
let query = url::form_urlencoded::Serializer::new(String::new())
{{#queryParams}}
.append_pair("{{baseName}}", {{paramName}})
{{/queryParams}}
.finish();
let uri = format!("{}{{{path}}}{}", configuration.base_path, query{{#allParams}}, "{{baseName}}"={{paramName}}{{/allParams}}));
let uri = format!("{}{{{path}}}{}", configuration.base_path, query{{#pathParams}}, {{baseName}}={{paramName}}{{/pathParams}});
{{/hasQueryParams}}

let mut req = hyper::Request::new(method, uri);
Expand Down Expand Up @@ -77,7 +77,7 @@ impl<C: hyper::client::Connect>{{classname}} for {{classname}}Impl<C> {
{{/returnType}}
{{#returnType}}
.and_then(|body| {
let parsed: Result<{{returnType}}, _> = serde_json::from_slice(&body);
let parsed: Result<{{{returnType}}}, _> = serde_json::from_slice(&body);
parsed.map_err(|e| Error::from(e))
}).map_err(|e| Error::from(e))
{{/returnType}}
Expand Down
2 changes: 1 addition & 1 deletion modules/swagger-codegen/src/main/resources/rust/api_mod.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ impl From<serde_json::Error> for Error {
}
}

use super::models;
use super::models::*;

{{#apiInfo}}
{{#apis}}
Expand Down
2 changes: 1 addition & 1 deletion modules/swagger-codegen/src/main/resources/rust/model.mustache
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ impl {{classname}} {
pub fn new({{#requiredVars}}{{name}}: {{{datatype}}}{{^-last}}, {{/-last}}{{/requiredVars}}) -> {{classname}} {
{{classname}} {
{{#vars}}
{{name}}: {{#required}}{{name}}{{/required}}{{^required}}{{#isListContainer}}None{{/isListContainer}}{{#isMapContainer}}Hash:new(){{/isMapContainer}}{{^isContainer}}None{{/isContainer}}{{/required}}{{#hasMore}},{{/hasMore}}
{{name}}: {{#required}}{{name}}{{/required}}{{^required}}{{#isListContainer}}None{{/isListContainer}}{{#isMapContainer}}HashMap::new(){{/isMapContainer}}{{^isContainer}}None{{/isContainer}}{{/required}}{{#hasMore}},{{/hasMore}}
{{/vars}}
}
}
Expand Down