MIRRORS/linux-yocto
1
0
Fork 0
mirror of git://git.yoctoproject.org/linux-yocto.git synced 2025-10-22 23:13:01 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

rust: init: simplify from map_err to inspect_err

Browse Source 
A new complexity lint, `manual_inspect` [1], has been introduced in
the upcoming Rust 1.81 (currently in nightly), which checks for uses of
`map*` which return the original item:

    error:
    --> rust/kernel/init.rs:846:23
        |
    846 |         (self.1)(val).map_err(|e| {
        |                       ^^^^^^^
        |
        = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#manual_inspect
        = note: `-D clippy::manual-inspect` implied by `-D warnings`
        = help: to override `-D warnings` add `#[allow(clippy::manual_inspect)]`
    help: try
        |
    846 ~         (self.1)(val).inspect_err(|e| {
    847 |             // SAFETY: `slot` was initialized above.
    848 ~             unsafe { core::ptr::drop_in_place(slot) };
        |

Thus clean them up.

Link: https://rust-lang.github.io/rust-clippy/master/index.html#/manual_inspect [1]
Tested-by: Benno Lossin <benno.lossin@proton.me>
Tested-by: Andreas Hindborg <a.hindborg@samsung.com>
Link: https://lore.kernel.org/r/20240709160615.998336-3-ojeda@kernel.org
Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
This commit is contained in:
Miguel Ojeda 2024-07-09 18:05:57 +02:00
parent e516211f61
commit dee1396a48
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
rust/kernel/init.rs
View File

@ -843,11 +843,8 @@ where
let val = unsafe { &mut *slot }; let val = unsafe { &mut *slot };
// SAFETY: `slot` is considered pinned. // SAFETY: `slot` is considered pinned.
let val = unsafe { Pin::new_unchecked(val) }; let val = unsafe { Pin::new_unchecked(val) };
(self.1)(val).map_err(|e| { // SAFETY: `slot` was initialized above.
// SAFETY: `slot` was initialized above. (self.1)(val).inspect_err(|_| unsafe { core::ptr::drop_in_place(slot) })
unsafe { core::ptr::drop_in_place(slot) };
e
})
} }
} }
@ -941,11 +938,9 @@ where
// SAFETY: All requirements fulfilled since this function is `__init`. // SAFETY: All requirements fulfilled since this function is `__init`.
unsafe { self.0.__pinned_init(slot)? }; unsafe { self.0.__pinned_init(slot)? };
// SAFETY: The above call initialized `slot` and we still have unique access. // SAFETY: The above call initialized `slot` and we still have unique access.
(self.1)(unsafe { &mut *slot }).map_err(|e| { (self.1)(unsafe { &mut *slot }).inspect_err(|_|
// SAFETY: `slot` was initialized above. // SAFETY: `slot` was initialized above.
unsafe { core::ptr::drop_in_place(slot) }; unsafe { core::ptr::drop_in_place(slot) })
e
})
} }
} }