chore: revert swapping None to _
This commit is contained in:
parent
e06adec728
commit
df7c60293b
1 changed files with 7 additions and 7 deletions
|
@ -255,7 +255,7 @@ impl Entity {
|
||||||
_ => return Err(EntityError::MultipleEntities),
|
_ => return Err(EntityError::MultipleEntities),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
_ => json,
|
None => json,
|
||||||
};
|
};
|
||||||
|
|
||||||
let raw_id: &str = json
|
let raw_id: &str = json
|
||||||
|
@ -289,7 +289,7 @@ impl Entity {
|
||||||
}
|
}
|
||||||
map
|
map
|
||||||
}
|
}
|
||||||
_ => BTreeMap::new(),
|
None => BTreeMap::new(),
|
||||||
}
|
}
|
||||||
}};
|
}};
|
||||||
}
|
}
|
||||||
|
@ -323,7 +323,7 @@ impl Entity {
|
||||||
}
|
}
|
||||||
map
|
map
|
||||||
}
|
}
|
||||||
_ => BTreeMap::new(),
|
None => BTreeMap::new(),
|
||||||
};
|
};
|
||||||
|
|
||||||
let sitelinks = match json.get("sitelinks") {
|
let sitelinks = match json.get("sitelinks") {
|
||||||
|
@ -361,7 +361,7 @@ impl Entity {
|
||||||
}
|
}
|
||||||
map
|
map
|
||||||
}
|
}
|
||||||
_ => BTreeMap::new(),
|
None => BTreeMap::new(),
|
||||||
};
|
};
|
||||||
|
|
||||||
let entity_type = match &json.get("type").ok_or(EntityError::NoEntityType)?.as_str() {
|
let entity_type = match &json.get("type").ok_or(EntityError::NoEntityType)?.as_str() {
|
||||||
|
@ -678,7 +678,7 @@ fn try_get_as_qid(datavalue: &Value) -> Result<Qid, EntityError> {
|
||||||
fn take_prop(key: &'static str, claim: &mut Value) -> Value {
|
fn take_prop(key: &'static str, claim: &mut Value) -> Value {
|
||||||
match claim.as_object_mut() {
|
match claim.as_object_mut() {
|
||||||
Some(obj) => obj.remove(key).unwrap_or(Value::Null),
|
Some(obj) => obj.remove(key).unwrap_or(Value::Null),
|
||||||
_ => Value::Null,
|
None => Value::Null,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -705,14 +705,14 @@ fn parse_wb_time(time: &str) -> Result<chrono::DateTime<chrono::offset::Utc>, En
|
||||||
Ok(0) | Err(_) => None,
|
Ok(0) | Err(_) => None,
|
||||||
Ok(x) => Some(x),
|
Ok(x) => Some(x),
|
||||||
},
|
},
|
||||||
_ => None,
|
None => None,
|
||||||
};
|
};
|
||||||
let day: Option<u32> = match dash_parts.get(2) {
|
let day: Option<u32> = match dash_parts.get(2) {
|
||||||
Some(day_str) => match day_str.parse() {
|
Some(day_str) => match day_str.parse() {
|
||||||
Ok(0) | Err(_) => None,
|
Ok(0) | Err(_) => None,
|
||||||
Ok(x) => Some(x),
|
Ok(x) => Some(x),
|
||||||
},
|
},
|
||||||
_ => None,
|
None => None,
|
||||||
};
|
};
|
||||||
#[allow(deprecated)] // TODO: avoid using ymd_opt here
|
#[allow(deprecated)] // TODO: avoid using ymd_opt here
|
||||||
let maybe_date = Utc.ymd_opt(year, month.unwrap_or(1), day.unwrap_or(1));
|
let maybe_date = Utc.ymd_opt(year, month.unwrap_or(1), day.unwrap_or(1));
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue