bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #89943 - matthiaskrgr:clpcompl, r=oli-obk

Browse source 
clippy::complexity fixes
This commit is contained in:
Yuki Okushi 2021-10-17 07:52:20 +09:00 • committed by GitHub
commit b8173c59c6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/rustc_middle/src/mir/interpret/allocation.rs
View file

@ -1004,13 +1004,13 @@ impl<Tag: Copy, Extra> Allocation<Tag, Extra> {
/// Checks that a range of bytes is initialized. If not, returns the `InvalidUninitBytes`
/// error which will report the first range of bytes which is uninitialized.
fn check_init(&self, range: AllocRange) -> AllocResult {
self.is_init(range).or_else(|idx_range| {
Err(AllocError::InvalidUninitBytes(Some(UninitBytesAccess {
self.is_init(range).map_err(|idx_range| {
AllocError::InvalidUninitBytes(Some(UninitBytesAccess {
access_offset: range.start,
access_size: range.size,
uninit_offset: idx_range.start,
uninit_size: idx_range.end - idx_range.start, // `Size` subtraction
})))
}))
})
}