jichan.org/jichan.org
jichan.org/jichan.org
1
0
Fork 0
generated from ElnuDev/rust-project
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove JmdictExampleSentence, is a dead field

Browse source
This commit is contained in:
Elnu 2023-07-27 22:12:08 -07:00
parent c2b2147e04
commit 9cdf67e90d
2 changed files with 3 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

28
jmdict/src/models/jmdict.rs
View file

@ -19,29 +19,6 @@ pub struct JmdictEntry {
pub sense: Vec<JmdictSense>,
}
#[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<JmdictExampleSentence>,
}
#[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<String>,
#[serde(deserialize_with = "nullable_list")]
pub glossary: Vec<JmdictGlossary>,
#[serde(deserialize_with = "nullable_list")]
pub examples: Vec<JmdictExample>,
// Always empty with latest version of JMdict
#[serde(default, skip_serializing, deserialize_with = "err_if_not_blank")]
examples: serde::de::IgnoredAny,
}
#[derive(Serialize, Deserialize)]

11
jmdict/src/serial.rs
View file

@ -54,17 +54,6 @@ fn parse_language_code(code_str: &str) -> Result<LanguageCode, LanguageCodeError
})
}
pub fn lang<'de, D>(deserializer: D) -> Result<LanguageCode, D::Error>
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<LanguageCode, D::Error>
where
D: Deserializer<'de>,