Skip to content
Snippets Groups Projects

rust: enable clippy::or_fun_call lint

Closed Mitchell Kember requested to merge topic/default/clippy-or-fun-call into branch/default
1 file
+ 9
9
Compare changes
  • Side-by-side
  • Inline
@@ -880,9 +880,9 @@
if parent_base.0 == p1.0 {
break;
}
p1 = self.check_revision(parent_base).ok_or(
RevlogError::InvalidRevision(parent_base.to_string()),
)?;
p1 = self.check_revision(parent_base).ok_or_else(|| {
RevlogError::InvalidRevision(parent_base.to_string())
})?;
}
while let Some(p2_entry) = self.get_entry(p2) {
if p2_entry.compressed_len() != 0 || p2.0 == 0 {
@@ -893,10 +893,10 @@
if parent_base.0 == p2.0 {
break;
}
p2 = self.check_revision(parent_base).ok_or(
RevlogError::InvalidRevision(parent_base.to_string()),
)?;
p2 = self.check_revision(parent_base).ok_or_else(|| {
RevlogError::InvalidRevision(parent_base.to_string())
})?;
}
if base == p1.0 || base == p2.0 {
return Ok(false);
}
@@ -899,10 +899,10 @@
}
if base == p1.0 || base == p2.0 {
return Ok(false);
}
rev = self
.check_revision(base.into())
.ok_or(RevlogError::InvalidRevision(base.to_string()))?;
rev = self.check_revision(base.into()).ok_or_else(|| {
RevlogError::InvalidRevision(base.to_string())
})?;
}
Ok(rev == NULL_REVISION)
}
Loading