loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

Stop deriving Eq for models (#3463)

Browse Source 
It fails if the model contains a float, which don't implement Eq.

Fix for bug introduced in #3309.

We really need to improve the testing of the rust generator to catch this sort of mistake in future. I don't have time to do this now, though.
This commit is contained in:
Benjamin Gill 2019-07-29 14:01:01 +01:00 committed by GitHub
parent 1bf8c15206
commit c684505cba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/openapi-generator/src/main/resources/rust/model.mustache vendored
View File

@ -20,7 +20,7 @@ pub enum {{classname}} {
{{!-- for non-enum schemas --}} {{!-- for non-enum schemas --}}
{{^isEnum}} {{^isEnum}}
#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)] #[derive(Debug, PartialEq, Serialize, Deserialize)]
pub struct {{{classname}}} { pub struct {{{classname}}} {
{{#vars}} {{#vars}}
{{#description}} {{#description}}
@ -49,7 +49,7 @@ impl {{{classname}}} {
{{#vars}} {{#vars}}
{{#isEnum}} {{#isEnum}}
/// {{{description}}} /// {{{description}}}
#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)] #[derive(Debug, PartialEq, Serialize, Deserialize)]
pub enum {{enumName}} { pub enum {{enumName}} {
{{#allowableValues}} {{#allowableValues}}
{{#enumVars}} {{#enumVars}}

2
samples/client/petstore/rust-reqwest/src/models/api_response.rs
View File

@ -11,7 +11,7 @@
/// ApiResponse : Describes the result of uploading an image resource /// ApiResponse : Describes the result of uploading an image resource
#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)] #[derive(Debug, PartialEq, Serialize, Deserialize)]
pub struct ApiResponse { pub struct ApiResponse {
#[serde(rename = "code", skip_serializing_if = "Option::is_none")] #[serde(rename = "code", skip_serializing_if = "Option::is_none")]
pub code: Option<i32>, pub code: Option<i32>,

2
samples/client/petstore/rust-reqwest/src/models/category.rs
View File

@ -11,7 +11,7 @@
/// Category : A category for a pet /// Category : A category for a pet
#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)] #[derive(Debug, PartialEq, Serialize, Deserialize)]
pub struct Category { pub struct Category {
#[serde(rename = "id", skip_serializing_if = "Option::is_none")] #[serde(rename = "id", skip_serializing_if = "Option::is_none")]
pub id: Option<i64>, pub id: Option<i64>,

4
samples/client/petstore/rust-reqwest/src/models/order.rs
View File

@ -11,7 +11,7 @@
/// Order : An order for a pets from the pet store /// Order : An order for a pets from the pet store
#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)] #[derive(Debug, PartialEq, Serialize, Deserialize)]
pub struct Order { pub struct Order {
#[serde(rename = "id", skip_serializing_if = "Option::is_none")] #[serde(rename = "id", skip_serializing_if = "Option::is_none")]
pub id: Option<i64>, pub id: Option<i64>,
@ -43,7 +43,7 @@ impl Order {
} }
/// Order Status /// Order Status
#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)] #[derive(Debug, PartialEq, Serialize, Deserialize)]
pub enum Status { pub enum Status {
#[serde(rename = "placed")] #[serde(rename = "placed")]
Placed, Placed,

4
samples/client/petstore/rust-reqwest/src/models/pet.rs
View File

@ -11,7 +11,7 @@
/// Pet : A pet for sale in the pet store /// Pet : A pet for sale in the pet store
#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)] #[derive(Debug, PartialEq, Serialize, Deserialize)]
pub struct Pet { pub struct Pet {
#[serde(rename = "id", skip_serializing_if = "Option::is_none")] #[serde(rename = "id", skip_serializing_if = "Option::is_none")]
pub id: Option<i64>, pub id: Option<i64>,
@ -43,7 +43,7 @@ impl Pet {
} }
/// pet status in the store /// pet status in the store
#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)] #[derive(Debug, PartialEq, Serialize, Deserialize)]
pub enum Status { pub enum Status {
#[serde(rename = "available")] #[serde(rename = "available")]
Available, Available,

2
samples/client/petstore/rust-reqwest/src/models/tag.rs
View File

@ -11,7 +11,7 @@
/// Tag : A tag for a pet /// Tag : A tag for a pet
#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)] #[derive(Debug, PartialEq, Serialize, Deserialize)]
pub struct Tag { pub struct Tag {
#[serde(rename = "id", skip_serializing_if = "Option::is_none")] #[serde(rename = "id", skip_serializing_if = "Option::is_none")]
pub id: Option<i64>, pub id: Option<i64>,

2
samples/client/petstore/rust-reqwest/src/models/user.rs
View File

@ -11,7 +11,7 @@
/// User : A User who is purchasing from the pet store /// User : A User who is purchasing from the pet store
#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)] #[derive(Debug, PartialEq, Serialize, Deserialize)]
pub struct User { pub struct User {
#[serde(rename = "id", skip_serializing_if = "Option::is_none")] #[serde(rename = "id", skip_serializing_if = "Option::is_none")]
pub id: Option<i64>, pub id: Option<i64>,

2
samples/client/petstore/rust/src/models/api_response.rs
View File

@ -11,7 +11,7 @@
/// ApiResponse : Describes the result of uploading an image resource /// ApiResponse : Describes the result of uploading an image resource
#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)] #[derive(Debug, PartialEq, Serialize, Deserialize)]
pub struct ApiResponse { pub struct ApiResponse {
#[serde(rename = "code", skip_serializing_if = "Option::is_none")] #[serde(rename = "code", skip_serializing_if = "Option::is_none")]
pub code: Option<i32>, pub code: Option<i32>,

2
samples/client/petstore/rust/src/models/category.rs
View File

@ -11,7 +11,7 @@
/// Category : A category for a pet /// Category : A category for a pet
#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)] #[derive(Debug, PartialEq, Serialize, Deserialize)]
pub struct Category { pub struct Category {
#[serde(rename = "id", skip_serializing_if = "Option::is_none")] #[serde(rename = "id", skip_serializing_if = "Option::is_none")]
pub id: Option<i64>, pub id: Option<i64>,

4
samples/client/petstore/rust/src/models/order.rs
View File

@ -11,7 +11,7 @@
/// Order : An order for a pets from the pet store /// Order : An order for a pets from the pet store
#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)] #[derive(Debug, PartialEq, Serialize, Deserialize)]
pub struct Order { pub struct Order {
#[serde(rename = "id", skip_serializing_if = "Option::is_none")] #[serde(rename = "id", skip_serializing_if = "Option::is_none")]
pub id: Option<i64>, pub id: Option<i64>,
@ -43,7 +43,7 @@ impl Order {
} }
/// Order Status /// Order Status
#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)] #[derive(Debug, PartialEq, Serialize, Deserialize)]
pub enum Status { pub enum Status {
#[serde(rename = "placed")] #[serde(rename = "placed")]
Placed, Placed,

4
samples/client/petstore/rust/src/models/pet.rs
View File

@ -11,7 +11,7 @@
/// Pet : A pet for sale in the pet store /// Pet : A pet for sale in the pet store
#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)] #[derive(Debug, PartialEq, Serialize, Deserialize)]
pub struct Pet { pub struct Pet {
#[serde(rename = "id", skip_serializing_if = "Option::is_none")] #[serde(rename = "id", skip_serializing_if = "Option::is_none")]
pub id: Option<i64>, pub id: Option<i64>,
@ -43,7 +43,7 @@ impl Pet {
} }
/// pet status in the store /// pet status in the store
#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)] #[derive(Debug, PartialEq, Serialize, Deserialize)]
pub enum Status { pub enum Status {
#[serde(rename = "available")] #[serde(rename = "available")]
Available, Available,

2
samples/client/petstore/rust/src/models/tag.rs
View File

@ -11,7 +11,7 @@
/// Tag : A tag for a pet /// Tag : A tag for a pet
#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)] #[derive(Debug, PartialEq, Serialize, Deserialize)]
pub struct Tag { pub struct Tag {
#[serde(rename = "id", skip_serializing_if = "Option::is_none")] #[serde(rename = "id", skip_serializing_if = "Option::is_none")]
pub id: Option<i64>, pub id: Option<i64>,

2
samples/client/petstore/rust/src/models/user.rs
View File

@ -11,7 +11,7 @@
/// User : A User who is purchasing from the pet store /// User : A User who is purchasing from the pet store
#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)] #[derive(Debug, PartialEq, Serialize, Deserialize)]
pub struct User { pub struct User {
#[serde(rename = "id", skip_serializing_if = "Option::is_none")] #[serde(rename = "id", skip_serializing_if = "Option::is_none")]
pub id: Option<i64>, pub id: Option<i64>,