Received-SPF: pass (google.com: domain of linux-kernel+bounces-144164-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1;
Date: Sun, 14 Apr 2024 18:49:28 +0530
Subject: [PATCH] rust: update `dbg!()` to format column number
Precedence: bulk
Mime-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Message-Id: <ca7b5992-61ae-4353-adcb-f81d7ca12f0d@smtp-relay.sendinblue.com>
Origin-messageId: <20240414131928.846625-1-dev@raxyte.com>
To: <ojeda@kernel.org>,<alex.gaynor@gmail.com>,<wedsonaf@gmail.com>,<boqun.feng@gmail.com>,<gary@garyguo.net>,<bjorn3_gh@protonmail.com>,<benno.lossin@proton.me>,<a.hindborg@samsung.com>,<aliceryhl@google.com>,<dev@raxyte.com>,<rust-for-linux@vger.kernel.org>,<linux-kernel@vger.kernel.org>
Feedback-ID: 77.32.148.22:7517309_-1:7517309:Sendinblue
From: <dev@raxyte.com>

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: Raghav Narang <dev@raxyte.com>
---
 Branch rust-next=20

 rust/kernel/std=5Fvendor.rs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/rust/kernel/std=5Fvendor.rs b/rust/kernel/std=5Fvendor.rs
index 388d6a514..39679a960 100644
--- a/rust/kernel/std=5Fvendor.rs
+++ b/rust/kernel/std=5Fvendor.rs
@@ -146,15 +146,16 @@ macro=5Frules! dbg {
     // `$val` expression could be a block (`{ .. }`), in which case the =
`pr=5Finfo!`
     // will be malformed.
     () =3D> {
-        $crate::pr=5Finfo!(=22[{}:{}]\n=22, ::core::file!(), ::core::line!=
())
+        $crate::pr=5Finfo!(=22[{}:{}:{}]\n=22, ::core::file!(), =
::core::line!(), ::core::column!())
     };
     ($val:expr $(,)=3F) =3D> {
         // Use of `match` here is intentional because it affects the =
lifetimes
         // of temporaries - https://stackoverflow.com/a/48732525/1063961
         match $val {
             tmp =3D> {
-                $crate::pr=5Finfo!(=22[{}:{}] {} =3D {:#=3F}\n=22,
-                    ::core::file!(), ::core::line!(), ::core::stringify!=
($val), &tmp);
+                $crate::pr=5Finfo!(=22[{}:{}:{}] {} =3D {:#=3F}\n=22,
+                    ::core::file!(), ::core::line!(), ::core::column!(),
+                    ::core::stringify!($val), &tmp);
                 tmp
             }
         }

base-commit: 8db31d3f3bd5dbc8cf3a22bba04b4b4add7f984e
--=20
2.44.0