summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <treehugger-gerrit@google.com> 2022-11-17 11:04:46 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-11-17 11:04:46 +0000
commit2fdbd6c634209e28c72c82726bae10b980019d10 (patch)
tree6adeb626db5082991566f7106e0000201668a64e
parente7cee8931e4e9ccd76f11191de54fa74cd91a1f7 (diff)
parent58c011a4c9f56312ba395af177b1e150474e15cd (diff)
Merge "Fix warnings from rustc 1.65.0" am: 8a7d59c60e am: 5021ea85b3 am: 58c011a4c9
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2305178 Change-Id: I30c4adc38215f784e53874c898d6adc9e1241f53 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--libs/binder/rust/tests/integration.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/binder/rust/tests/integration.rs b/libs/binder/rust/tests/integration.rs
index 4e10fa915d..ca2cedc19d 100644
--- a/libs/binder/rust/tests/integration.rs
+++ b/libs/binder/rust/tests/integration.rs
@@ -502,7 +502,7 @@ mod tests {
let instances = binder::get_declared_instances("android.hardware.light.ILights")
.expect("Could not get declared instances");
- let expected_defaults = if has_lights { 1 } else { 0 };
+ let expected_defaults = usize::from(has_lights);
assert_eq!(expected_defaults, instances.iter().filter(|i| i.as_str() == "default").count());
}