diff --git a/src/corpus.rs b/src/corpus.rs index 5dd59ea..3426359 100644 --- a/src/corpus.rs +++ b/src/corpus.rs @@ -36,8 +36,8 @@ pub fn load(path: &str) -> Result, AppError> { /// The primary ICD code a matched entry contributes (falls back to star/addon). pub fn primary_code(e: &AlphaIdEntry) -> Option<&str> { - for c in [&e.icd_primary, &e.icd_primary2, &e.icd_star, &e.icd_addon] { - if !c.is_empty() { return Some(c); } - } - None + [&e.icd_primary, &e.icd_primary2, &e.icd_star, &e.icd_addon] + .into_iter() + .find(|c| !c.is_empty()) + .map(|s| s.as_str()) }