From: <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>
Subject: [PATCH] rust: update `dbg!()` to format column number
Date: Sun, 14 Apr 2024 18:49:28 +0530 [thread overview]
Message-ID: <eba70259-9b10-4bf7-ac4f-d7accf6b8891@smtp-relay.sendinblue.com> (raw)
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
rust/kernel/std_vendor.rs | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/rust/kernel/std_vendor.rs b/rust/kernel/std_vendor.rs
index 388d6a514..39679a960 100644
--- a/rust/kernel/std_vendor.rs
+++ b/rust/kernel/std_vendor.rs
@@ -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
}
}
base-commit: 8db31d3f3bd5dbc8cf3a22bba04b4b4add7f984e
--
2.44.0
next reply other threads:[~2024-04-14 13:21 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-14 13:19 dev [this message]
2024-04-16 5:58 ` [PATCH] rust: update `dbg!()` to format column number Trevor Gross
2024-04-16 9:34 ` Miguel Ojeda
2024-04-17 13:50 ` Gary Guo
2024-05-05 22:28 ` Miguel Ojeda
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=eba70259-9b10-4bf7-ac4f-d7accf6b8891@smtp-relay.sendinblue.com \
--to=dev@raxyte.com \
--cc=a.hindborg@samsung.com \
--cc=alex.gaynor@gmail.com \
--cc=aliceryhl@google.com \
--cc=benno.lossin@proton.me \
--cc=bjorn3_gh@protonmail.com \
--cc=boqun.feng@gmail.com \
--cc=gary@garyguo.net \
--cc=linux-kernel@vger.kernel.org \
--cc=ojeda@kernel.org \
--cc=rust-for-linux@vger.kernel.org \
--cc=wedsonaf@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).