From 9cdf67e90d8286f6abacf476b4ad8ebeefcbc142 Mon Sep 17 00:00:00 2001 From: ElnuDev Date: Thu, 27 Jul 2023 22:12:08 -0700 Subject: [PATCH] Remove JmdictExampleSentence, is a dead field --- jmdict/src/models/jmdict.rs | 28 +++------------------------- jmdict/src/serial.rs | 11 ----------- 2 files changed, 3 insertions(+), 36 deletions(-) diff --git a/jmdict/src/models/jmdict.rs b/jmdict/src/models/jmdict.rs index d8decc1..6e9be19 100644 --- a/jmdict/src/models/jmdict.rs +++ b/jmdict/src/models/jmdict.rs @@ -19,29 +19,6 @@ pub struct JmdictEntry { pub sense: Vec, } -#[derive(Serialize, Deserialize)] -#[serde(rename_all(deserialize = "PascalCase"), deny_unknown_fields)] -pub struct JmdictExample { - // Always empty with latest version of JMdict - #[serde(default, skip_serializing, deserialize_with = "err_if_not_blank")] - srcaswdfa: serde::de::IgnoredAny, - pub sentences: Vec, -} - -#[derive(Serialize, Deserialize)] -#[serde(rename_all(deserialize = "PascalCase"), deny_unknown_fields)] -pub struct JmdictExampleSentence { - #[serde(deserialize_with = "lang")] - pub lang: LanguageCode, - pub text: String, -} - -#[derive(Serialize, Deserialize)] -#[serde(rename_all(deserialize = "PascalCase"), deny_unknown_fields)] -pub enum JmdictExampleSourceSrcType { - Amogus, -} - #[derive(Serialize, Deserialize)] #[serde(rename_all(deserialize = "PascalCase"), deny_unknown_fields)] pub struct JmdictGlossary { @@ -117,8 +94,9 @@ pub struct JmdictSense { pub information: Vec, #[serde(deserialize_with = "nullable_list")] pub glossary: Vec, - #[serde(deserialize_with = "nullable_list")] - pub examples: Vec, + // Always empty with latest version of JMdict + #[serde(default, skip_serializing, deserialize_with = "err_if_not_blank")] + examples: serde::de::IgnoredAny, } #[derive(Serialize, Deserialize)] diff --git a/jmdict/src/serial.rs b/jmdict/src/serial.rs index a587c4e..df85525 100644 --- a/jmdict/src/serial.rs +++ b/jmdict/src/serial.rs @@ -54,17 +54,6 @@ fn parse_language_code(code_str: &str) -> Result(deserializer: D) -> Result -where - D: Deserializer<'de>, -{ - lang_option(deserializer) - .transpose() - .unwrap_or(Err(serde::de::Error::custom( - "Expected language code, found null!", - ))) -} - pub fn lang_default_eng<'de, D>(deserializer: D) -> Result where D: Deserializer<'de>,