Skip to content

Commit c684505

Browse files
authored
Stop deriving Eq for models (#3463)
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.
1 parent 1bf8c15 commit c684505

File tree

13 files changed

+18
-18
lines changed

13 files changed

+18
-18
lines changed

modules/openapi-generator/src/main/resources/rust/model.mustache

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ pub enum {{classname}} {
2020

2121
{{!-- for non-enum schemas --}}
2222
{{^isEnum}}
23-
#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
23+
#[derive(Debug, PartialEq, Serialize, Deserialize)]
2424
pub struct {{{classname}}} {
2525
{{#vars}}
2626
{{#description}}
@@ -49,7 +49,7 @@ impl {{{classname}}} {
4949
{{#vars}}
5050
{{#isEnum}}
5151
/// {{{description}}}
52-
#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
52+
#[derive(Debug, PartialEq, Serialize, Deserialize)]
5353
pub enum {{enumName}} {
5454
{{#allowableValues}}
5555
{{#enumVars}}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
/// ApiResponse : Describes the result of uploading an image resource
1212
1313

14-
#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
14+
#[derive(Debug, PartialEq, Serialize, Deserialize)]
1515
pub struct ApiResponse {
1616
#[serde(rename = "code", skip_serializing_if = "Option::is_none")]
1717
pub code: Option<i32>,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
/// Category : A category for a pet
1212
1313

14-
#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
14+
#[derive(Debug, PartialEq, Serialize, Deserialize)]
1515
pub struct Category {
1616
#[serde(rename = "id", skip_serializing_if = "Option::is_none")]
1717
pub id: Option<i64>,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
/// Order : An order for a pets from the pet store
1212
1313

14-
#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
14+
#[derive(Debug, PartialEq, Serialize, Deserialize)]
1515
pub struct Order {
1616
#[serde(rename = "id", skip_serializing_if = "Option::is_none")]
1717
pub id: Option<i64>,
@@ -43,7 +43,7 @@ impl Order {
4343
}
4444

4545
/// Order Status
46-
#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
46+
#[derive(Debug, PartialEq, Serialize, Deserialize)]
4747
pub enum Status {
4848
#[serde(rename = "placed")]
4949
Placed,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
/// Pet : A pet for sale in the pet store
1212
1313

14-
#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
14+
#[derive(Debug, PartialEq, Serialize, Deserialize)]
1515
pub struct Pet {
1616
#[serde(rename = "id", skip_serializing_if = "Option::is_none")]
1717
pub id: Option<i64>,
@@ -43,7 +43,7 @@ impl Pet {
4343
}
4444

4545
/// pet status in the store
46-
#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
46+
#[derive(Debug, PartialEq, Serialize, Deserialize)]
4747
pub enum Status {
4848
#[serde(rename = "available")]
4949
Available,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
/// Tag : A tag for a pet
1212
1313

14-
#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
14+
#[derive(Debug, PartialEq, Serialize, Deserialize)]
1515
pub struct Tag {
1616
#[serde(rename = "id", skip_serializing_if = "Option::is_none")]
1717
pub id: Option<i64>,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
/// User : A User who is purchasing from the pet store
1212
1313

14-
#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
14+
#[derive(Debug, PartialEq, Serialize, Deserialize)]
1515
pub struct User {
1616
#[serde(rename = "id", skip_serializing_if = "Option::is_none")]
1717
pub id: Option<i64>,

samples/client/petstore/rust/src/models/api_response.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
/// ApiResponse : Describes the result of uploading an image resource
1212
1313

14-
#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
14+
#[derive(Debug, PartialEq, Serialize, Deserialize)]
1515
pub struct ApiResponse {
1616
#[serde(rename = "code", skip_serializing_if = "Option::is_none")]
1717
pub code: Option<i32>,

samples/client/petstore/rust/src/models/category.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
/// Category : A category for a pet
1212
1313

14-
#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
14+
#[derive(Debug, PartialEq, Serialize, Deserialize)]
1515
pub struct Category {
1616
#[serde(rename = "id", skip_serializing_if = "Option::is_none")]
1717
pub id: Option<i64>,

samples/client/petstore/rust/src/models/order.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
/// Order : An order for a pets from the pet store
1212
1313

14-
#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
14+
#[derive(Debug, PartialEq, Serialize, Deserialize)]
1515
pub struct Order {
1616
#[serde(rename = "id", skip_serializing_if = "Option::is_none")]
1717
pub id: Option<i64>,
@@ -43,7 +43,7 @@ impl Order {
4343
}
4444

4545
/// Order Status
46-
#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
46+
#[derive(Debug, PartialEq, Serialize, Deserialize)]
4747
pub enum Status {
4848
#[serde(rename = "placed")]
4949
Placed,

samples/client/petstore/rust/src/models/pet.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
/// Pet : A pet for sale in the pet store
1212
1313

14-
#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
14+
#[derive(Debug, PartialEq, Serialize, Deserialize)]
1515
pub struct Pet {
1616
#[serde(rename = "id", skip_serializing_if = "Option::is_none")]
1717
pub id: Option<i64>,
@@ -43,7 +43,7 @@ impl Pet {
4343
}
4444

4545
/// pet status in the store
46-
#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
46+
#[derive(Debug, PartialEq, Serialize, Deserialize)]
4747
pub enum Status {
4848
#[serde(rename = "available")]
4949
Available,

samples/client/petstore/rust/src/models/tag.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
/// Tag : A tag for a pet
1212
1313

14-
#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
14+
#[derive(Debug, PartialEq, Serialize, Deserialize)]
1515
pub struct Tag {
1616
#[serde(rename = "id", skip_serializing_if = "Option::is_none")]
1717
pub id: Option<i64>,

samples/client/petstore/rust/src/models/user.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
/// User : A User who is purchasing from the pet store
1212
1313

14-
#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
14+
#[derive(Debug, PartialEq, Serialize, Deserialize)]
1515
pub struct User {
1616
#[serde(rename = "id", skip_serializing_if = "Option::is_none")]
1717
pub id: Option<i64>,

0 commit comments

Comments
 (0)