diff --git a/Cargo.toml b/Cargo.toml index 880bab1..14c92eb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "wikidata" version = "1.1.0" -edition = "2018" +edition = "2024" repository = "https://github.com/syvb/wikidata/" license = "Apache-2.0" description = "A library for working with Wikidata in Rust" diff --git a/src/entity.rs b/src/entity.rs index a681c56..6cf7951 100755 --- a/src/entity.rs +++ b/src/entity.rs @@ -1,6 +1,6 @@ use std::{collections::BTreeMap, str::FromStr}; -use crate::ids::{consts, Fid, Lid, Pid, Qid, Sid, WikiId}; +use crate::ids::{Fid, Lid, Pid, Qid, Sid, WikiId, consts}; use crate::text::{Lang, Text}; use chrono::{DateTime, TimeZone, Utc}; use serde::{Deserialize, Serialize}; @@ -197,10 +197,10 @@ impl Entity { pub fn instances(&self) -> Vec { let mut instances = Vec::with_capacity(1); for (pid, claim) in &self.claims { - if *pid == consts::INSTANCE_OF { - if let ClaimValueData::Item(qid) = claim.data { - instances.push(qid); - } + if *pid == consts::INSTANCE_OF + && let ClaimValueData::Item(qid) = claim.data + { + instances.push(qid); } } instances.shrink_to_fit(); @@ -211,10 +211,10 @@ impl Entity { #[must_use] pub fn start_time(&self) -> Option> { for (pid, claim) in &self.claims { - if *pid == consts::DATE_OF_BIRTH { - if let ClaimValueData::DateTime { date_time, .. } = claim.data { - return Some(date_time); - } + if *pid == consts::DATE_OF_BIRTH + && let ClaimValueData::DateTime { date_time, .. } = claim.data + { + return Some(date_time); } } None @@ -224,10 +224,10 @@ impl Entity { #[must_use] pub fn end_time(&self) -> Option> { for (pid, claim) in &self.claims { - if *pid == consts::DATE_OF_DEATH { - if let ClaimValueData::DateTime { date_time, .. } = claim.data { - return Some(date_time); - } + if *pid == consts::DATE_OF_DEATH + && let ClaimValueData::DateTime { date_time, .. } = claim.data + { + return Some(date_time); } } None