This picks up from Michal Rostecki's work[0]. Per Michal's guidance I have omitted Co-authored tags, as the end result is quite different.
This series is intended to be taken through rust-next. The final patch in the series requires some other subsystems' `Acked-by`s: - drivers/android/binder/stats.rs: rust_binder. Alice, could you take a look? - rust/kernel/device.rs: driver-core. Already acked by gregkh. - rust/kernel/firmware.rs: driver-core. Danilo, could you take a look? - rust/kernel/seq_file.rs: vfs. Christian, could you take a look? - rust/kernel/sync/*: locking-core. Boqun, could you take a look? Link: https://lore.kernel.org/rust-for-linux/[email protected]/t/#u [0] Closes: https://github.com/Rust-for-Linux/linux/issues/1075 Signed-off-by: Tamir Duberstein <[email protected]> --- Changes in v18: - Rebase on rust-next and fix more backsliding. (thanks Alice!) - Link to v17: https://lore.kernel.org/r/[email protected] Changes in v17: - Rebase on rust-next and fix backsliding relative to series 2a and 2b. - Link to v16: https://lore.kernel.org/r/[email protected] Changes in v16: - Rebase on rust-next. - Link to v15: https://lore.kernel.org/r/[email protected] Changes in v15: - Seal `CStrExt`. (Benno Lossin) - Add patch to remove trailing commas from samples/rust/rust_driver_platform.rs. - Link to v14: https://lore.kernel.org/r/[email protected] Changes in v14: - Break the change into multiple series. - Move `CStr` reexport to `kernel::ffi`. (Alice Ryhl) - `pub use core::fmt::{....}` in `kernel/fmt.rs`. (Benno Lossin) - Avoid unnecessary binding to `first_lit` in `fmt!`. (Benno Lossin) - Add comment to `identifier`-extracting loop. (Benno Lossin) - Change `quote_spanned!` formatting. (Benno Lossin) - Link to v13: https://lore.kernel.org/r/[email protected] Changes in v13: - Rebase on v6.16-rc4. - Link to v12: https://lore.kernel.org/r/[email protected] Changes in v12: - Introduce `kernel::fmt::Display` to allow implementations on foreign types. - Tidy up doc comment on `str_to_cstr`. (Alice Ryhl). - Link to v11: https://lore.kernel.org/r/[email protected] Changes in v11: - Use `quote_spanned!` to avoid `use<'a, T>` and generally reduce manual token construction. - Add a commit to simplify `quote_spanned!`. - Drop first commit in favor of https://lore.kernel.org/rust-for-linux/[email protected]/. (Miguel Ojeda) - Correctly handle expressions such as `pr_info!("{a}", a = a = a)`. (Benno Lossin) - Avoid dealing with `}}` escapes, which is not needed. (Benno Lossin) - Revert some unnecessary changes. (Benno Lossin) - Rename `c_str_avoid_literals!` to `str_to_cstr!`. (Benno Lossin & Alice Ryhl). - Link to v10: https://lore.kernel.org/r/[email protected] Changes in v10: - Rebase on cbeaa41dfe26b72639141e87183cb23e00d4b0dd. - Implement Alice's suggestion to use a proc macro to work around orphan rules otherwise preventing `core::ffi::CStr` to be directly printed with `{}`. - Link to v9: https://lore.kernel.org/r/[email protected] Changes in v9: - Rebase on rust-next. - Restore `impl Display for BStr` which exists upstream[1]. - Link: https://doc.rust-lang.org/nightly/std/bstr/struct.ByteStr.html#impl-Display-for-ByteStr [1] - Link to v8: https://lore.kernel.org/r/[email protected] Changes in v8: - Move `{from,as}_char_ptr` back to `CStrExt`. This reduces the diff some. - Restore `from_bytes_with_nul_unchecked_mut`, `to_cstring`. - Link to v7: https://lore.kernel.org/r/[email protected] Changes in v7: - Rebased on mainline. - Restore functionality added in commit a321f3ad0a5d ("rust: str: add {make,to}_{upper,lower}case() to CString"). - Used `diff.algorithm patience` to improve diff readability. - Link to v6: https://lore.kernel.org/r/[email protected] Changes in v6: - Split the work into several commits for ease of review. - Restore `{from,as}_char_ptr` to allow building on ARM (see commit message). - Add `CStrExt` to `kernel::prelude`. (Alice Ryhl) - Remove `CStrExt::from_bytes_with_nul_unchecked_mut` and restore `DerefMut for CString`. (Alice Ryhl) - Rename and hide `kernel::c_str!` to encourage use of C-String literals. - Drop implementation and invocation changes in kunit.rs. (Trevor Gross) - Drop docs on `Display` impl. (Trevor Gross) - Rewrite docs in the style of the standard library. - Restore the `test_cstr_debug` unit tests to demonstrate that the implementation has changed. Changes in v5: - Keep the `test_cstr_display*` unit tests. Changes in v4: - Provide the `CStrExt` trait with `display()` method, which returns a `CStrDisplay` wrapper with `Display` implementation. This addresses the lack of `Display` implementation for `core::ffi::CStr`. - Provide `from_bytes_with_nul_unchecked_mut()` method in `CStrExt`, which might be useful and is going to prevent manual, unsafe casts. - Fix a typo (s/preffered/prefered/). Changes in v3: - Fix the commit message. - Remove redundant braces in `use`, when only one item is imported. Changes in v2: - Do not remove `c_str` macro. While it's preferred to use C-string literals, there are two cases where `c_str` is helpful: - When working with macros, which already return a Rust string literal (e.g. `stringify!`). - When building macros, where we want to take a Rust string literal as an argument (for caller's convenience), but still use it as a C-string internally. - Use Rust literals as arguments in macros (`new_mutex`, `new_condvar`, `new_mutex`). Use the `c_str` macro to convert these literals to C-string literals. - Use `c_str` in kunit.rs for converting the output of `stringify!` to a `CStr`. - Remove `DerefMut` implementation for `CString`. --- Tamir Duberstein (16): samples: rust: platform: remove trailing commas rust_binder: remove trailing comma rust_binder: use `kernel::fmt` rust_binder: use `core::ffi::CStr` method names rnull: use `kernel::fmt` rust: alloc: use `kernel::fmt` rust: debugfs: use `kernel::fmt` rust: pci: use `kernel::fmt` rust: remove spurious `use core::fmt::Debug` rust: opp: use `CStr::as_char_ptr` rust: opp: fix broken rustdoc link rust: configfs: use `CStr::as_char_ptr` rust: regulator: use `CStr::as_char_ptr` rust: clk: use `CStr::as_char_ptr` rust: support formatting of foreign types rust: replace `CStr` with `core::ffi::CStr` drivers/android/binder/error.rs | 5 +- drivers/android/binder/process.rs | 2 +- drivers/android/binder/stats.rs | 6 +- drivers/block/rnull/configfs.rs | 9 +- rust/ffi.rs | 2 + rust/kernel/alloc/kvec/errors.rs | 14 +- rust/kernel/clk.rs | 4 +- rust/kernel/configfs.rs | 2 +- rust/kernel/debugfs.rs | 2 +- rust/kernel/debugfs/callback_adapters.rs | 7 +- rust/kernel/debugfs/entry.rs | 2 +- rust/kernel/debugfs/file_ops.rs | 6 +- rust/kernel/debugfs/traits.rs | 10 +- rust/kernel/device.rs | 1 + rust/kernel/drm/ioctl.rs | 4 +- rust/kernel/error.rs | 2 + rust/kernel/firmware.rs | 9 +- rust/kernel/fmt.rs | 87 ++++++- rust/kernel/opp.rs | 8 +- rust/kernel/pci/id.rs | 3 +- rust/kernel/prelude.rs | 7 +- rust/kernel/ptr.rs | 1 - rust/kernel/regulator.rs | 9 +- rust/kernel/seq_file.rs | 2 +- rust/kernel/str.rs | 395 +++++++------------------------ rust/kernel/sync/condvar.rs | 2 +- rust/kernel/sync/lock.rs | 2 +- rust/kernel/sync/lock/global.rs | 2 +- rust/macros/fmt.rs | 94 ++++++++ rust/macros/lib.rs | 19 ++ rust/macros/quote.rs | 7 + samples/rust/rust_driver_platform.rs | 4 +- 32 files changed, 367 insertions(+), 362 deletions(-) --- base-commit: 6f3b6e91f7201e248d83232538db14d30100e9c7 change-id: 20250201-cstr-core-d4b9b69120cf Best regards, -- Tamir Duberstein <[email protected]>
