Skip to contentSkip to conversation

rust: block: fix merge error

PATCH New Bert Karwatzki 1 participant 1 message Sep 17, 2025

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 rust: block: fix merge error

Fix the this compile error:

error: expected one of , or }, found ;
--> rust/kernel/block/mq/gen_disk.rs:12:23

   |
12 |     fmt::{self, Write};
   |                       ^
   |                       |
   |                       expected one of `,` or `}`
   |                       help: missing `,`

error: aborting due to 1 previous error

---
 rust/kernel/block/mq/gen_disk.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
rust/kernel/block/mq/gen_disk.rs +1 -1
index 51a239118ead..1ce815c8cdab 100644
@@ -9,7 +9,7 @@
     bindings,
     block::mq::{Operations, TagSet},
     error::{self, from_err_ptr, Result},
-    fmt::{self, Write};
+    fmt::{self, Write},
     prelude::*,
     static_lock_class,
     str::NullTerminatedFormatter,
Signature · 28 lines
2.47.3

linux-next-20250916 failt to compile with CONFIG_RUST=y and
the following error:

error: expected one of `,` or `}`, found `;`
  --> rust/kernel/block/mq/gen_disk.rs:12:23
   |
12 |     fmt::{self, Write};
   |                       ^
   |                       |
   |                       expected one of `,` or `}`
   |                       help: missing `,`

error: aborting due to 1 previous error

make[5]: *** [rust/Makefile:553: rust/kernel.o] Fehler 1

git blame shows commit
6e86e08cdc198 ("Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git")
as introducing the error:

$ git blame rust/kernel/block/mq/gen_disk.rs -L 12,12
6e86e08cdc198 (Mark Brown       2025-09-16 14:30:20 +0100 12)     fmt::{self, Write};

This patch fixes that.

Bert Karwatzki