[PATCH] rust: use the new name Location::file_as_c_str() in rustc 1.91.0+

[PATCH] rust: use the new name Location::file_as_c_str() in rustc 1.91.0+

[Alice Ryhl]

As part of the stabilization of Location::file_with_nul(), it was
brought up that the with_nul() suffix usually means something else in
Rust APIs, so the API is being renamed prior to stabilization. Thus,
adjust Linux to use the new name on new rustc versions.

Link: https://www.github.com/rust-lang/rust/pull/145928 [1]
Signed-off-by: Alice Ryhl <aliceryhl@google.com>
---
This hasn't been merged upstream yet. It shouldn't be merged until that
happens.
---
 init/Kconfig       |  3 +++
 rust/kernel/lib.rs | 15 +++++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/init/Kconfig b/init/Kconfig
index 83632025121937527523f5977a493bd3ae24ed9f..e7459cbea6ca800e56a1e54423e399b689557885 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -145,6 +145,9 @@ config RUSTC_HAS_UNNECESSARY_TRANSMUTES
 config RUSTC_HAS_FILE_WITH_NUL
 	def_bool RUSTC_VERSION >= 108900
 
+config RUSTC_HAS_FILE_AS_C_STR
+	def_bool RUSTC_VERSION >= 109100
+
 config PAHOLE_VERSION
 	int
 	default $(shell,$(srctree)/scripts/pahole-version.sh $(PAHOLE))
diff --git a/rust/kernel/lib.rs b/rust/kernel/lib.rs
index ed53169e795c0badf548025a57f946fa18bc73e3..604069b1bd5c373d2ad8419872a358a8d01d0bb5 100644
--- a/rust/kernel/lib.rs
+++ b/rust/kernel/lib.rs
@@ -296,7 +296,7 @@ macro_rules! asm {
 
 /// Gets the C string file name of a [`Location`].
 ///
-/// If `file_with_nul()` is not available, returns a string that warns about it.
+/// If `Location::file_as_c_str()` is not available, returns a string that warns about it.
 ///
 /// [`Location`]: core::panic::Location
 ///
@@ -310,8 +310,8 @@ macro_rules! asm {
 ///     let caller = core::panic::Location::caller();
 ///
 ///     // Output:
-///     // - A path like "rust/kernel/example.rs" if file_with_nul() is available.
-///     // - "<Location::file_with_nul() not supported>" otherwise.
+///     // - A path like "rust/kernel/example.rs" if `file_as_c_str()` is available.
+///     // - "<Location::file_as_c_str() not supported>" otherwise.
 ///     let caller_file = file_from_location(caller);
 ///
 ///     // Prints out the message with caller's file name.
@@ -326,14 +326,17 @@ macro_rules! asm {
 /// ```
 #[inline]
 pub fn file_from_location<'a>(loc: &'a core::panic::Location<'a>) -> &'a core::ffi::CStr {
-    #[cfg(CONFIG_RUSTC_HAS_FILE_WITH_NUL)]
+    #[cfg(CONFIG_RUSTC_HAS_FILE_AS_C_STR)]
+    {
+        loc.file_as_c_str()
+    }
+    #[cfg(all(CONFIG_RUSTC_HAS_FILE_WITH_NUL, not(CONFIG_RUSTC_HAS_FILE_AS_C_STR)))]
     {
         loc.file_with_nul()
     }
-
     #[cfg(not(CONFIG_RUSTC_HAS_FILE_WITH_NUL))]
     {
         let _ = loc;
-        c"<Location::file_with_nul() not supported>"
+        c"<Location::file_as_c_str() not supported>"
     }
 }

---
base-commit: c17b750b3ad9f45f2b6f7e6f7f4679844244f0b9
change-id: 20250827-file_as_c_str-b4d4eca4ce40

Best regards,
-- 
Alice Ryhl <aliceryhl@google.com>

Re: [PATCH] rust: use the new name Location::file_as_c_str() in rustc 1.91.0+

[Boqun Feng]

On Wed, Aug 27, 2025 at 01:12:16PM +0000, Alice Ryhl wrote:
> As part of the stabilization of Location::file_with_nul(), it was
> brought up that the with_nul() suffix usually means something else in
> Rust APIs, so the API is being renamed prior to stabilization. Thus,
> adjust Linux to use the new name on new rustc versions.
> 
> Link: https://www.github.com/rust-lang/rust/pull/145928 [1]
> Signed-off-by: Alice Ryhl <aliceryhl@google.com>

Thanks for doing this!

Reviewed-by: Boqun Feng <boqun.feng@gmail.com>

> ---
> This hasn't been merged upstream yet. It shouldn't be merged until that
> happens.

Let me know when it gets upstreamed, I'm happy to do a test then.

Regards,
Boqun

> ---
>  init/Kconfig       |  3 +++
>  rust/kernel/lib.rs | 15 +++++++++------
>  2 files changed, 12 insertions(+), 6 deletions(-)
[...]

Re: [PATCH] rust: use the new name Location::file_as_c_str() in rustc 1.91.0+

[Alice Ryhl]

On Wed, Aug 27, 2025 at 07:56:35AM -0700, Boqun Feng wrote:
> On Wed, Aug 27, 2025 at 01:12:16PM +0000, Alice Ryhl wrote:
> > As part of the stabilization of Location::file_with_nul(), it was
> > brought up that the with_nul() suffix usually means something else in
> > Rust APIs, so the API is being renamed prior to stabilization. Thus,
> > adjust Linux to use the new name on new rustc versions.
> > 
> > Link: https://www.github.com/rust-lang/rust/pull/145928 [1]
> > Signed-off-by: Alice Ryhl <aliceryhl@google.com>
> 
> Thanks for doing this!
> 
> Reviewed-by: Boqun Feng <boqun.feng@gmail.com>
> 
> > ---
> > This hasn't been merged upstream yet. It shouldn't be merged until that
> > happens.
> 
> Let me know when it gets upstreamed, I'm happy to do a test then.

The PR just landed.

Alice

Re: [PATCH] rust: use the new name Location::file_as_c_str() in rustc 1.91.0+

[Miguel Ojeda]

On Wed, Aug 27, 2025 at 3:12 PM Alice Ryhl <aliceryhl@google.com> wrote:
>
> As part of the stabilization of Location::file_with_nul(), it was
> brought up that the with_nul() suffix usually means something else in
> Rust APIs, so the API is being renamed prior to stabilization. Thus,
> adjust Linux to use the new name on new rustc versions.
>
> Link: https://www.github.com/rust-lang/rust/pull/145928 [1]
> Signed-off-by: Alice Ryhl <aliceryhl@google.com>

Applied to `rust-fixes` -- thanks everyone!

    [ Kept `cfg` separation. Reworded slightly. - Miguel ]

Cheers,
Miguel