Replace `map -> unwrap_or` with `map_or`
- Id
- 2e118d9230ab41d94d50bb95c4957185f4b400c9
- Author
- Caio
- Commit time
- 2020-03-22T10:42:13+01:00
Modified tique/src/dismax.rs
let mut sum = 0.0;
debug_assert!(self.current.is_some());
- for scorer in self.scorers.iter_mut() {
- if self.current.map(|d| scorer.doc() == d).unwrap_or(false) {
+ for scorer in &mut self.scorers {
+ if self.current.map_or(false, |d| scorer.doc() == d) {
let score = scorer.score();
sum += score;
for (idx, scorer) in self.scorers.iter_mut().enumerate() {
// Advance every scorer that's on target or behind
- if self.current.map(|d| d >= scorer.doc()).unwrap_or(true) && !scorer.advance() {
+ if self.current.map_or(true, |d| d >= scorer.doc()) && !scorer.advance() {
to_remove.push(idx);
continue;
}
let doc = scorer.doc();
- if next_target.map(|next| doc < next).unwrap_or(true) {
+ if next_target.map_or(true, |next| doc < next) {
next_target.replace(doc);
}
}
Modified tique/src/topterms.rs
/// The `boost_factor` parameter is useful when building more
/// complex queries; `1.0` is a good default.
pub fn into_boosted_query(self, boost_factor: f32) -> BooleanQuery {
- let max_score = self.0.first().map(|(_term, score)| *score).unwrap_or(0.0);
+ let max_score = self.0.first().map_or(0.0, |(_term, score)| *score);
let mut clauses: Vec<(Occur, Box<dyn Query>)> = Vec::new();
fn field_is_valid(schema: &Schema, field: Field) -> bool {
if let FieldType::Str(opts) = schema.get_field_entry(field).field_type() {
opts.get_indexing_options()
- .map(|opts| opts.index_option().has_freq())
- .unwrap_or(false)
+ .map_or(false, |opts| opts.index_option().has_freq())
} else {
false
}
Modified tique/src/queryparser/parser.rs
self.state
.iter()
.position(|(opt_name, _opt_boost, _interpreter)| {
- opt_name
- .as_ref()
- .map(|name| name == field_name)
- .unwrap_or(false)
+ opt_name.as_ref().map_or(false, |name| name == field_name)
})
}
self.state
.iter()
.any(|(opt_name, _opt_boost, _interpreter)| {
- opt_name
- .as_ref()
- .map(|name| name == field_name)
- .unwrap_or(false)
+ opt_name.as_ref().map_or(false, |name| name == field_name)
})
}
}