Commit ea175b2d authored by Raghav Narang's avatar Raghav Narang Committed by Miguel Ojeda
Browse files

rust: update `dbg!()` to format column number 

In Rust 1.76.0, the `dbg!()` macro was updated to also format the column
number. The reason cited was usage of a few characters worth of
horizontal space while allowing direct jumps to the source location. [1]

Link: https://github.com/rust-lang/rust/pull/114962 [1]
Link: https://github.com/Rust-for-Linux/linux/issues/1065


Signed-off-by: default avatarRaghav Narang <dev@raxyte.com>
Reviewed-by: default avatarTrevor Gross <tmgross@umich.edu>
Reviewed-by: default avatarGary Guo <gary@garyguo.net>
Link: https://lore.kernel.org/r/eba70259-9b10-4bf7-ac4f-d7accf6b8891@smtp-relay.sendinblue.com


[ Fixed commit author name and removed spurious newline in message. - Miguel ]
Signed-off-by: default avatarMiguel Ojeda <ojeda@kernel.org>
parent 84373132

rust/kernel/std_vendor.rs

+4 −3
Original line number Diff line number Diff line
@@ -146,15 +146,16 @@ macro_rules! dbg { 
    // `$val` expression could be a block (`{ .. }`), in which case the `pr_info!`

    // will be malformed.

    () => {

        $crate::pr_info!("[{}:{}]\n", ::core::file!(), ::core::line!())

        $crate::pr_info!("[{}:{}:{}]\n", ::core::file!(), ::core::line!(), ::core::column!())

    };

    ($val:expr $(,)?) => {

        // Use of `match` here is intentional because it affects the lifetimes

        // of temporaries - https://stackoverflow.com/a/48732525/1063961

        match $val {

            tmp => {

                $crate::pr_info!("[{}:{}] {} = {:#?}\n",

                    ::core::file!(), ::core::line!(), ::core::stringify!($val), &tmp);

                $crate::pr_info!("[{}:{}:{}] {} = {:#?}\n",

                    ::core::file!(), ::core::line!(), ::core::column!(),

                    ::core::stringify!($val), &tmp);

                tmp

            }

        }