Commit ae75c401 authored by Thomas Böhler's avatar Thomas Böhler Committed by Miguel Ojeda
Browse files

drm/panic: prefer eliding lifetimes 

Eliding lifetimes when possible instead of specifying them directly is
both shorter and easier to read. Clippy notes this in the
`needless_lifetimes` lint:

    error: the following explicit lifetimes could be elided: 'b
       --> drivers/gpu/drm/drm_panic_qr.rs:479:16
        |
    479 |     fn new<'a, 'b>(segments: &[&Segment<'b>], data: &'a mut [u8]) -> Option<EncodedMsg<'a>> {
        |                ^^                       ^^
        |
        = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#needless_lifetimes


        = note: `-D clippy::needless-lifetimes` implied by `-D warnings`
        = help: to override `-D warnings` add `#[allow(clippy::needless_lifetimes)]`
    help: elide the lifetimes
        |
    479 -     fn new<'a, 'b>(segments: &[&Segment<'b>], data: &'a mut [u8]) -> Option<EncodedMsg<'a>> {
    479 +     fn new<'a>(segments: &[&Segment<'_>], data: &'a mut [u8]) -> Option<EncodedMsg<'a>> {
        |

Remove the explicit lifetime annotation in favour of an elided lifetime.

Fixes: cb5164ac ("drm/panic: Add a QR code panic screen")
Reported-by: default avatarMiguel Ojeda <ojeda@kernel.org>
Link: https://github.com/Rust-for-Linux/linux/issues/1123


Signed-off-by: default avatarThomas Böhler <witcher@wiredspace.de>
Reviewed-by: default avatarJocelyn Falempe <jfalempe@redhat.com>
Link: https://lore.kernel.org/r/20241019084048.22336-4-witcher@wiredspace.de


Signed-off-by: default avatarMiguel Ojeda <ojeda@kernel.org>
parent 7b6de57e

drivers/gpu/drm/drm_panic_qr.rs

+1 −1
Original line number Diff line number Diff line
@@ -476,7 +476,7 @@ struct EncodedMsg<'a> { 
/// Data to be put in the QR code, with correct segment encoding, padding, and

/// Error Code Correction.

impl EncodedMsg<'_> {

    fn new<'a, 'b>(segments: &[&Segment<'b>], data: &'a mut [u8]) -> Option<EncodedMsg<'a>> {

    fn new<'a>(segments: &[&Segment<'_>], data: &'a mut [u8]) -> Option<EncodedMsg<'a>> {

        let version = Version::from_segments(segments)?;

        let ec_size = version.ec_size();

        let g1_blocks = version.g1_blocks();