Re: linux-next: manual merge of the rust tree with the driver-core tree

Miguel Ojeda
2025-11-20T09:15:25Z

On Thu, Nov 20, 2025 at 8:11 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> I have applied the following (hack) merge resolution for today.

Thanks a lot Stephen for taking the time to do that instead of dropping it.

We should be able to do the same as Tamir did in commit 657403637f7d
("rust: acpi: use `core::ffi::CStr` method names"), i.e. move the
build assert below to then be able to use `len()` instead:

diff --git a/rust/kernel/i2c.rs b/rust/kernel/i2c.rs
index aea1b44d189b..f67c355c988e 100644
--- a/rust/kernel/i2c.rs
+++ b/rust/kernel/i2c.rs
@@ -43,11 +43,8 @@ impl DeviceId {
/// Create a new device id from an I2C 'id' string.
#[inline(always)]
pub const fn new(id: &'static CStr) -> Self {
- build_assert!(
- id.len_with_nul() <= Self::I2C_NAME_SIZE,
- "ID exceeds 20 bytes"
- );
- let src = id.as_bytes_with_nul();
+ let src = id.to_bytes_with_nul();
+ build_assert!(src.len() <= Self::I2C_NAME_SIZE, "ID exceeds 20 bytes");
let mut i2c: bindings::i2c_device_id = pin_init::zeroed();
let mut i = 0;
while i < src.len() {
@@ -433,11 +430,8 @@ impl I2cBoardInfo {
/// Create a new [`I2cBoardInfo`] for a kernel driver.
#[inline(always)]
pub const fn new(type_: &'static CStr, addr: u16) -> Self {
- build_assert!(
- type_.len_with_nul() <= Self::I2C_TYPE_SIZE,
- "Type exceeds 20 bytes"
- );
- let src = type_.as_bytes_with_nul();
+ let src = type_.to_bytes_with_nul();
+ build_assert!(src.len() <= Self::I2C_TYPE_SIZE, "Type exceeds
20 bytes");
let mut i2c_board_info: bindings::i2c_board_info = pin_init::zeroed();
let mut i: usize = 0;
while i < src.len() {

Igor/Tamir?

Cheers,
Miguel