From 0c9cecd7a3f4f0d835696d53a1231083be545ad0 Mon Sep 17 00:00:00 2001 From: dobefore <46564102+dobefore@users.noreply.github.com> Date: Wed, 9 Nov 2022 10:36:23 +0800 Subject: [PATCH] Fix error while compiling rslib (#2187) * protobuf generate error pass --experimental_allow_proto3_optional to protoc add missing dereive trait to struct Daylimit * delete invalid derive trait Eq * remove argument from protoc --experimental_allow_proto3_optional --- rslib/build/protobuf.rs | 2 +- rslib/src/import_export/text/mod.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rslib/build/protobuf.rs b/rslib/build/protobuf.rs index 9c819f9fe..83309f767 100644 --- a/rslib/build/protobuf.rs +++ b/rslib/build/protobuf.rs @@ -112,7 +112,7 @@ pub fn write_backend_proto_rs() { ) .type_attribute( "Deck.Normal.DayLimit", - "#[derive(Copy, serde_derive::Deserialize, serde_derive::Serialize)]", + "#[derive(Copy, Eq, serde_derive::Deserialize, serde_derive::Serialize)]", ) .type_attribute("HelpPageLinkRequest.HelpPage", "#[derive(strum::EnumIter)]") .type_attribute("CsvMetadata.Delimiter", "#[derive(strum::EnumIter)]") diff --git a/rslib/src/import_export/text/mod.rs b/rslib/src/import_export/text/mod.rs index d84450a44..ba3822d9f 100644 --- a/rslib/src/import_export/text/mod.rs +++ b/rslib/src/import_export/text/mod.rs @@ -22,7 +22,7 @@ pub struct ForeignData { updated_tags: Vec, } -#[derive(Debug, Clone, PartialEq, Eq, Default, Serialize, Deserialize)] +#[derive(Debug, Clone, PartialEq, Default, Serialize, Deserialize)] #[serde(default)] pub struct ForeignNote { guid: String,