Fixes for Rust v1.85.1
Bug: http://b/421269002
Test: m rust
Change-Id: I113c54e7d069cbffd864a1f8eb107a7b7e14c69b
diff --git a/src/service.rs b/src/service.rs
index ef01dbb..8f4c11c 100644
--- a/src/service.rs
+++ b/src/service.rs
@@ -239,7 +239,7 @@
// If there is no limit or if we managed to write everything without hitting the
// limit, it means there are no idle pages left in zram. If we did hit the limit,
// it means there is no idle pages remaining because mmd always write back huge pages last.
- details.limit.map_or(true, |limit| limit.actual_pages != total_written_pages)
+ details.limit.is_none_or(|limit| limit.actual_pages != total_written_pages)
|| details.huge.written_pages > 0
}
Err(ZramWritebackError::BackoffTime)
diff --git a/src/zram/writeback.rs b/src/zram/writeback.rs
index 6f26e59..d34432b 100644
--- a/src/zram/writeback.rs
+++ b/src/zram/writeback.rs
@@ -274,7 +274,7 @@
None
};
- if params.huge_idle && writeback_limit.map_or(true, |limit| limit > 0) {
+ if params.huge_idle && writeback_limit.is_none_or(|limit| limit > 0) {
writeback_limit = self.writeback::<Z, M>(
params,
Mode::HugeIdle,
@@ -284,7 +284,7 @@
now,
)?;
}
- if params.idle && writeback_limit.map_or(true, |limit| limit > 0) {
+ if params.idle && writeback_limit.is_none_or(|limit| limit > 0) {
writeback_limit = self.writeback::<Z, M>(
params,
Mode::Idle,
@@ -294,7 +294,7 @@
now,
)?;
}
- if params.huge && writeback_limit.map_or(true, |limit| limit > 0) {
+ if params.huge && writeback_limit.is_none_or(|limit| limit > 0) {
self.writeback::<Z, M>(
params,
Mode::Huge,
