| commit | acdf867d86b6746df9704035899244797a8f43ab | [log] [tgz] |
|---|---|---|
| author | Stephen Hines <srhines@google.com> | Fri Feb 09 23:28:07 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Feb 09 23:28:07 2024 +0000 |
| tree | afdfb3b2bb7c9c8bf43c2e0e5777f050e1cfa58c | |
| parent | 00976ee3374f819939c3c53a2733d68ab2305edd [diff] | |
| parent | 1ab22ea6b6e5e9dc76c8bd980550186577bae0e4 [diff] |
Merge "Allow clippy::unnecessary_fallible_conversions" into main am: 1ab22ea6b6 Original change: https://android-review.googlesource.com/c/platform/packages/modules/Virtualization/+/2956135 Change-Id: I99489fe294a835fb555ea893a1abad92f2079792 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()?,