Skip to content

Commit 47dfbd1

Browse files
committed
Rename flag to has-borrowed-data
1 parent dd00442 commit 47dfbd1

File tree

6 files changed

+71
-73
lines changed

6 files changed

+71
-73
lines changed

openapi-generator-template/model.mustache

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ impl Default for {{classname}} {
129129
{{/vendorExtensions.x-rust-builder}}{{!
130130
}}{{#vendorExtensions.x-rust-has-byte-array}}#[serde_as]{{/vendorExtensions.x-rust-has-byte-array}}{{!
131131
}}{{#oneOf.isEmpty}}#[derive(Clone, Default, Debug, PartialEq, Serialize, Deserialize)]
132-
pub struct {{{classname}}}{{#vendorExtensions.x-rust-is-used-as-input}}<'a{{#vendorExtensions.x-rust-generic-parameter}}, {{{.}}}{{/vendorExtensions.x-rust-generic-parameter}}>{{/vendorExtensions.x-rust-is-used-as-input}}{{^vendorExtensions.x-rust-is-used-as-input}}{{#vendorExtensions.x-rust-generic-parameter}}<{{{.}}}>{{/vendorExtensions.x-rust-generic-parameter}}{{/vendorExtensions.x-rust-is-used-as-input}} {
132+
pub struct {{{classname}}}{{#vendorExtensions.x-rust-has-borrowed-data}}<'a{{#vendorExtensions.x-rust-generic-parameter}}, {{{.}}}{{/vendorExtensions.x-rust-generic-parameter}}>{{/vendorExtensions.x-rust-has-borrowed-data}}{{^vendorExtensions.x-rust-has-borrowed-data}}{{#vendorExtensions.x-rust-generic-parameter}}<{{{.}}}>{{/vendorExtensions.x-rust-generic-parameter}}{{/vendorExtensions.x-rust-has-borrowed-data}} {
133133
{{#vars}}
134134
{{#description}}
135135
/// {{{.}}}
@@ -148,15 +148,15 @@ pub struct {{{classname}}}{{#vendorExtensions.x-rust-is-used-as-input}}<'a{{#ven
148148
### Enums
149149
}}{{#isEnum}}{{#isArray}}{{#uniqueItems}}std::collections::HashSet<{{/uniqueItems}}{{^uniqueItems}}Vec<{{/uniqueItems}}{{/isArray}}{{{enumName}}}{{#isArray}}>{{/isArray}}{{/isEnum}}{{!
150150
### Models
151-
}}{{^isEnum}}{{#isModel}}{{^avoidBoxedModels}}Box<{{/avoidBoxedModels}}{{{dataType}}}{{#vendorExtensions.x-rust-is-used-as-input}}{{#model}}{{#vendorExtensions.x-rust-is-used-as-input}}<'a>{{/vendorExtensions.x-rust-is-used-as-input}}{{^vendorExtensions.x-rust-is-used-as-input}}<'static>{{/vendorExtensions.x-rust-is-used-as-input}}{{/model}}{{/vendorExtensions.x-rust-is-used-as-input}}{{^avoidBoxedModels}}>{{/avoidBoxedModels}}{{/isModel}}{{!
151+
}}{{^isEnum}}{{#isModel}}{{^avoidBoxedModels}}Box<{{/avoidBoxedModels}}{{{dataType}}}{{#vendorExtensions.x-rust-has-borrowed-data}}{{#model}}{{#vendorExtensions.x-rust-has-borrowed-data}}<'a>{{/vendorExtensions.x-rust-has-borrowed-data}}{{^vendorExtensions.x-rust-has-borrowed-data}}<'static>{{/vendorExtensions.x-rust-has-borrowed-data}}{{/model}}{{/vendorExtensions.x-rust-has-borrowed-data}}{{^avoidBoxedModels}}>{{/avoidBoxedModels}}{{/isModel}}{{!
152152
### ByteArray
153153
}}{{^isModel}}{{#isByteArray}}Vec<u8>{{/isByteArray}}{{!
154154
### String
155-
}}{{^isByteArray}}{{#isString}}{{#model}}{{#vendorExtensions.x-rust-is-used-as-input}}Cow<'a, str>{{/vendorExtensions.x-rust-is-used-as-input}}{{^vendorExtensions.x-rust-is-used-as-input}}String{{/vendorExtensions.x-rust-is-used-as-input}}{{/model}}{{/isString}}{{!
155+
}}{{^isByteArray}}{{#isString}}{{#model}}{{#vendorExtensions.x-rust-has-borrowed-data}}Cow<'a, str>{{/vendorExtensions.x-rust-has-borrowed-data}}{{^vendorExtensions.x-rust-has-borrowed-data}}String{{/vendorExtensions.x-rust-has-borrowed-data}}{{/model}}{{/isString}}{{!
156156
### Arrays
157157
}}{{^isString}}{{#isArray}}Vec<{{#items}}{{!
158158
### Array Models
159-
}}{{#isModel}}{{{dataType}}}{{#vendorExtensions.x-rust-is-used-as-input}}{{#model}}{{#vendorExtensions.x-rust-is-used-as-input}}<'a>{{/vendorExtensions.x-rust-is-used-as-input}}{{^vendorExtensions.x-rust-is-used-as-input}}<'static>{{/vendorExtensions.x-rust-is-used-as-input}}{{/model}}{{/vendorExtensions.x-rust-is-used-as-input}}{{/isModel}}{{!
159+
}}{{#isModel}}{{{dataType}}}{{#vendorExtensions.x-rust-has-borrowed-data}}{{#model}}{{#vendorExtensions.x-rust-has-borrowed-data}}<'a>{{/vendorExtensions.x-rust-has-borrowed-data}}{{^vendorExtensions.x-rust-has-borrowed-data}}<'static>{{/vendorExtensions.x-rust-has-borrowed-data}}{{/model}}{{/vendorExtensions.x-rust-has-borrowed-data}}{{/isModel}}{{!
160160
### Array other datatypes
161161
}}{{^isModel}}{{{dataType}}}{{/isModel}}{{/items}}>{{/isArray}}{{!
162162
### Primitive datatypes
@@ -171,8 +171,8 @@ pub struct {{{classname}}}{{#vendorExtensions.x-rust-is-used-as-input}}<'a{{#ven
171171
{{/vars}}
172172
}
173173

174-
impl{{#vendorExtensions.x-rust-is-used-as-input}}<'a{{#vendorExtensions.x-rust-generic-parameter}}, {{{.}}}{{/vendorExtensions.x-rust-generic-parameter}}>{{/vendorExtensions.x-rust-is-used-as-input}}{{^vendorExtensions.x-rust-is-used-as-input}}{{#vendorExtensions.x-rust-generic-parameter}}<{{{.}}}>{{/vendorExtensions.x-rust-generic-parameter}}{{/vendorExtensions.x-rust-is-used-as-input}} {{!
175-
}}{{{classname}}}{{#vendorExtensions.x-rust-is-used-as-input}}<'a{{#vendorExtensions.x-rust-generic-parameter}}, {{{.}}}{{/vendorExtensions.x-rust-generic-parameter}}>{{/vendorExtensions.x-rust-is-used-as-input}}{{^vendorExtensions.x-rust-is-used-as-input}}{{#vendorExtensions.x-rust-generic-parameter}}<{{{.}}}>{{/vendorExtensions.x-rust-generic-parameter}}{{/vendorExtensions.x-rust-is-used-as-input}} {
174+
impl{{#vendorExtensions.x-rust-has-borrowed-data}}<'a{{#vendorExtensions.x-rust-generic-parameter}}, {{{.}}}{{/vendorExtensions.x-rust-generic-parameter}}>{{/vendorExtensions.x-rust-has-borrowed-data}}{{^vendorExtensions.x-rust-has-borrowed-data}}{{#vendorExtensions.x-rust-generic-parameter}}<{{{.}}}>{{/vendorExtensions.x-rust-generic-parameter}}{{/vendorExtensions.x-rust-has-borrowed-data}} {{!
175+
}}{{{classname}}}{{#vendorExtensions.x-rust-has-borrowed-data}}<'a{{#vendorExtensions.x-rust-generic-parameter}}, {{{.}}}{{/vendorExtensions.x-rust-generic-parameter}}>{{/vendorExtensions.x-rust-has-borrowed-data}}{{^vendorExtensions.x-rust-has-borrowed-data}}{{#vendorExtensions.x-rust-generic-parameter}}<{{{.}}}>{{/vendorExtensions.x-rust-generic-parameter}}{{/vendorExtensions.x-rust-has-borrowed-data}} {
176176
{{#description}}
177177
/// {{{.}}}
178178
{{/description}}
@@ -183,11 +183,11 @@ impl{{#vendorExtensions.x-rust-is-used-as-input}}<'a{{#vendorExtensions.x-rust-g
183183
}}{{^vendorExtensions.x-rust-type}}{{#isNullable}}Option<{{/isNullable}}{{!
184184
}}{{#isEnum}}{{#isArray}}{{#uniqueItems}}std::collections::HashSet<{{/uniqueItems}}{{^uniqueItems}}Vec<{{/uniqueItems}}{{/isArray}}{{{enumName}}}{{#isArray}}>{{/isArray}}{{/isEnum}}{{!
185185
}}{{^isEnum}}{{#isByteArray}}Vec<u8>{{/isByteArray}}{{!
186-
}}{{^isByteArray}}{{#isString}}{{#model}}{{#vendorExtensions.x-rust-is-used-as-input}}Cow<'a, str>{{/vendorExtensions.x-rust-is-used-as-input}}{{^vendorExtensions.x-rust-is-used-as-input}}String{{/vendorExtensions.x-rust-is-used-as-input}}{{/model}}{{/isString}}{{!
186+
}}{{^isByteArray}}{{#isString}}{{#model}}{{#vendorExtensions.x-rust-has-borrowed-data}}Cow<'a, str>{{/vendorExtensions.x-rust-has-borrowed-data}}{{^vendorExtensions.x-rust-has-borrowed-data}}String{{/vendorExtensions.x-rust-has-borrowed-data}}{{/model}}{{/isString}}{{!
187187
}}{{^isString}}{{#isArray}}Vec<{{#items}}{{!
188-
}}{{#isModel}}{{{dataType}}}{{#vendorExtensions.x-rust-is-used-as-input}}{{#model}}{{#vendorExtensions.x-rust-is-used-as-input}}<'a>{{/vendorExtensions.x-rust-is-used-as-input}}{{^vendorExtensions.x-rust-is-used-as-input}}<'static>{{/vendorExtensions.x-rust-is-used-as-input}}{{/model}}{{/vendorExtensions.x-rust-is-used-as-input}}{{/isModel}}{{!
188+
}}{{#isModel}}{{{dataType}}}{{#vendorExtensions.x-rust-has-borrowed-data}}{{#model}}{{#vendorExtensions.x-rust-has-borrowed-data}}<'a>{{/vendorExtensions.x-rust-has-borrowed-data}}{{^vendorExtensions.x-rust-has-borrowed-data}}<'static>{{/vendorExtensions.x-rust-has-borrowed-data}}{{/model}}{{/vendorExtensions.x-rust-has-borrowed-data}}{{/isModel}}{{!
189189
}}{{^isModel}}{{{dataType}}}{{/isModel}}{{/items}}>{{/isArray}}{{!
190-
}}{{^isArray}}{{{dataType}}}{{#isModel}}{{#vendorExtensions.x-rust-is-used-as-input}}{{#model}}{{#vendorExtensions.x-rust-is-used-as-input}}<'a>{{/vendorExtensions.x-rust-is-used-as-input}}{{^vendorExtensions.x-rust-is-used-as-input}}<'static>{{/vendorExtensions.x-rust-is-used-as-input}}{{/model}}{{/vendorExtensions.x-rust-is-used-as-input}}{{/isModel}}{{!
190+
}}{{^isArray}}{{{dataType}}}{{#isModel}}{{#vendorExtensions.x-rust-has-borrowed-data}}{{#model}}{{#vendorExtensions.x-rust-has-borrowed-data}}<'a>{{/vendorExtensions.x-rust-has-borrowed-data}}{{^vendorExtensions.x-rust-has-borrowed-data}}<'static>{{/vendorExtensions.x-rust-has-borrowed-data}}{{/model}}{{/vendorExtensions.x-rust-has-borrowed-data}}{{/isModel}}{{!
191191
}}{{/isArray}}{{/isString}}{{/isByteArray}}{{/isEnum}}{{!
192192
}}{{#isNullable}}>{{/isNullable}}{{/vendorExtensions.x-rust-type}}{{!
193193
### Comma for next arguement
@@ -218,16 +218,16 @@ impl{{#vendorExtensions.x-rust-is-used-as-input}}<'a{{#vendorExtensions.x-rust-g
218218
{{/description}}
219219
#[derive(Clone, Debug, PartialEq, Serialize, Deserialize)]
220220
#[serde(untagged)]
221-
pub enum {{classname}}{{#vendorExtensions.x-rust-is-used-as-input}}<'a>{{/vendorExtensions.x-rust-is-used-as-input}} {
221+
pub enum {{classname}}{{#vendorExtensions.x-rust-has-borrowed-data}}<'a>{{/vendorExtensions.x-rust-has-borrowed-data}} {
222222
{{#composedSchemas.oneOf}}
223223
{{#description}}
224224
/// {{{.}}}
225225
{{/description}}
226-
{{{name}}}({{#isModel}}{{^avoidBoxedModels}}Box<{{/avoidBoxedModels}}{{/isModel}}{{#isArray}}Vec<{{{items.dataType}}}{{#vendorExtensions.x-rust-is-used-as-input}}<'a>{{/vendorExtensions.x-rust-is-used-as-input}}>{{/isArray}}{{^isArray}}{{{dataType}}}{{#vendorExtensions.x-rust-is-used-as-input}}<'a>{{/vendorExtensions.x-rust-is-used-as-input}}{{/isArray}}{{#isModel}}{{^avoidBoxedModels}}>{{/avoidBoxedModels}}{{/isModel}}),
226+
{{{name}}}({{#isModel}}{{^avoidBoxedModels}}Box<{{/avoidBoxedModels}}{{/isModel}}{{#isArray}}Vec<{{{items.dataType}}}{{#vendorExtensions.x-rust-has-borrowed-data}}<'a>{{/vendorExtensions.x-rust-has-borrowed-data}}>{{/isArray}}{{^isArray}}{{{dataType}}}{{#vendorExtensions.x-rust-has-borrowed-data}}<'a>{{/vendorExtensions.x-rust-has-borrowed-data}}{{/isArray}}{{#isModel}}{{^avoidBoxedModels}}>{{/avoidBoxedModels}}{{/isModel}}),
227227
{{/composedSchemas.oneOf}}
228228
}
229229

230-
impl Default for {{classname}}{{#vendorExtensions.x-rust-is-used-as-input}}<'_>{{/vendorExtensions.x-rust-is-used-as-input}} {
230+
impl Default for {{classname}}{{#vendorExtensions.x-rust-has-borrowed-data}}<'_>{{/vendorExtensions.x-rust-has-borrowed-data}} {
231231
fn default() -> Self {
232232
{{#composedSchemas.oneOf}}{{#-first}}Self::{{{name}}}(Default::default()){{/-first}}{{/composedSchemas.oneOf}}
233233
}

openapi-generator-template/reqwest/api.mustache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ pub {{#supportAsync}}async {{/supportAsync}}fn {{{operationId}}}{{#vendorExtensi
114114
}}{{#isResponseFile}}{{#supportAsync}}reqwest::Response{{/supportAsync}}{{^supportAsync}}reqwest::blocking::Response{{/supportAsync}}{{/isResponseFile}}{{!
115115
}}{{^isResponseFile}}{{#supportMultipleResponses}}ResponseContent<{{{operationIdCamelCase}}}Success>{{/supportMultipleResponses}}{{^supportMultipleResponses}}{{!
116116
}}{{^returnType}}(){{/returnType}}{{!
117-
}}{{#isArray}}Vec<{{#returnProperty.items}}{{{dataType}}}{{#isModel}}{{#vendorExtensions.x-rust-is-used-as-input}}<'static>{{/vendorExtensions.x-rust-is-used-as-input}}{{/isModel}}{{/returnProperty.items}}>{{/isArray}}{{!
118-
}}{{^isArray}}{{#returnProperty}}{{{dataType}}}{{#isModel}}{{#vendorExtensions.x-rust-is-used-as-input}}<'static>{{/vendorExtensions.x-rust-is-used-as-input}}{{/isModel}}{{/returnProperty}}{{!
117+
}}{{#isArray}}Vec<{{#returnProperty.items}}{{{dataType}}}{{#isModel}}{{#vendorExtensions.x-rust-has-borrowed-data}}<'static>{{/vendorExtensions.x-rust-has-borrowed-data}}{{/isModel}}{{/returnProperty.items}}>{{/isArray}}{{!
118+
}}{{^isArray}}{{#returnProperty}}{{{dataType}}}{{#isModel}}{{#vendorExtensions.x-rust-has-borrowed-data}}<'static>{{/vendorExtensions.x-rust-has-borrowed-data}}{{/isModel}}{{/returnProperty}}{{!
119119
}}{{/isArray}}{{/supportMultipleResponses}}{{/isResponseFile}}{{/vendorExtensions.x-rust-return-type}}, Error<{{{operationIdCamelCase}}}Error>> {
120120
{{/vendorExtensions.x-group-parameters}}
121121
let uri_str = format!("{}{{{path}}}", configuration.base_path{{#pathParams}}, {{{baseName}}}={{#isString}}crate::apis::urlencode(&{{/isString}}{{{vendorExtensions.x-rust-param-identifier}}}{{^required}}.unwrap(){{/required}}{{#required}}{{#isNullable}}.unwrap(){{/isNullable}}{{/required}}{{#isArray}}.join(",").as_ref(){{/isArray}}{{^isString}}{{^isUuid}}{{^isPrimitiveType}}{{^isContainer}}.to_string(){{/isContainer}}{{/isPrimitiveType}}{{/isUuid}}{{/isString}}{{#isString}}){{/isString}}{{/pathParams}});

0 commit comments

Comments
 (0)