| commit | ca34a680cee84dc3ce515e608f9461d993dc2826 | [log] [tgz] |
|---|---|---|
| author | Stephen Hines <srhines@google.com> | Sat Feb 10 00:06:31 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Feb 10 00:06:31 2024 +0000 |
| tree | afdfb3b2bb7c9c8bf43c2e0e5777f050e1cfa58c | |
| parent | a45940da2ef24a671c822558b120ab2abdc33a01 [diff] | |
| parent | acdf867d86b6746df9704035899244797a8f43ab [diff] |
Merge "Allow clippy::unnecessary_fallible_conversions" into main am: 1ab22ea6b6 am: acdf867d86 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/2956135 Change-Id: I3d6456e1d6da7c233cbe9f675230993517f031b3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/authfs/fd_server/src/aidl.rs b/authfs/fd_server/src/aidl.rs index ada3ffb..8edd899 100644 --- a/authfs/fd_server/src/aidl.rs +++ b/authfs/fd_server/src/aidl.rs
@@ -375,6 +375,10 @@ } } +// FFI types like `c_long` vary on 32/64-bit, and the check is only needed on +// 64-bit conversions. Fixing this lint makes the code less readable. +#[allow(unknown_lints)] +#[allow(clippy::unnecessary_fallible_conversions)] fn try_into_fs_stat(st: Statvfs) -> Result<FsStat, std::num::TryFromIntError> { Ok(FsStat { blockSize: st.block_size().try_into()?,