mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Andreas Hindborg <a.hindborg@kernel.org>
To: "Boqun Feng" <boqun.feng@gmail.com>,
	"Miguel Ojeda" <ojeda@kernel.org>,
	"Alex Gaynor" <alex.gaynor@gmail.com>,
	"Gary Guo" <gary@garyguo.net>,
	"Björn Roy Baron" <bjorn3_gh@protonmail.com>,
	"Benno Lossin" <lossin@kernel.org>,
	"Alice Ryhl" <aliceryhl@google.com>,
	"Trevor Gross" <tmgross@umich.edu>,
	"Danilo Krummrich" <dakr@kernel.org>,
	"Jens Axboe" <axboe@kernel.dk>
Cc: linux-block@vger.kernel.org, rust-for-linux@vger.kernel.org,
	 linux-kernel@vger.kernel.org,
	Andreas Hindborg <a.hindborg@kernel.org>
Subject: [PATCH v2 06/14] rust: block: remove `RawWriter`
Date: Tue, 08 Jul 2025 21:45:01 +0200	[thread overview]
Message-ID: <20250708-rnull-up-v6-16-v2-6-ab93c0ff429b@kernel.org> (raw)
In-Reply-To: <20250708-rnull-up-v6-16-v2-0-ab93c0ff429b@kernel.org>

`RawWriter` is now dead code, so remove it.

Signed-off-by: Andreas Hindborg <a.hindborg@kernel.org>
---
 rust/kernel/block/mq.rs            |  1 -
 rust/kernel/block/mq/raw_writer.rs | 56 --------------------------------------
 2 files changed, 57 deletions(-)

diff --git a/rust/kernel/block/mq.rs b/rust/kernel/block/mq.rs
index fb0f393c1cea6..faa3ccb5a49a8 100644
--- a/rust/kernel/block/mq.rs
+++ b/rust/kernel/block/mq.rs
@@ -89,7 +89,6 @@
 
 pub mod gen_disk;
 mod operations;
-mod raw_writer;
 mod request;
 mod tag_set;
 
diff --git a/rust/kernel/block/mq/raw_writer.rs b/rust/kernel/block/mq/raw_writer.rs
deleted file mode 100644
index 0aef55703e71d..0000000000000
--- a/rust/kernel/block/mq/raw_writer.rs
+++ /dev/null
@@ -1,56 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0
-
-use core::fmt::{self, Write};
-
-use crate::error::Result;
-use crate::prelude::EINVAL;
-
-/// A mutable reference to a byte buffer where a string can be written into.
-///
-/// # Invariants
-///
-/// `buffer` is always null terminated.
-pub(crate) struct RawWriter<'a> {
-    buffer: &'a mut [u8],
-    pos: usize,
-}
-
-impl<'a> RawWriter<'a> {
-    /// Create a new `RawWriter` instance.
-    fn new(buffer: &'a mut [u8]) -> Result<RawWriter<'a>> {
-        *(buffer.last_mut().ok_or(EINVAL)?) = 0;
-
-        // INVARIANT: We null terminated the buffer above.
-        Ok(Self { buffer, pos: 0 })
-    }
-
-    #[expect(dead_code)]
-    pub(crate) fn from_array<const N: usize>(
-        a: &'a mut [crate::ffi::c_char; N],
-    ) -> Result<RawWriter<'a>> {
-        Self::new(
-            // SAFETY: the buffer of `a` is valid for read and write as `u8` for
-            // at least `N` bytes.
-            unsafe { core::slice::from_raw_parts_mut(a.as_mut_ptr().cast::<u8>(), N) },
-        )
-    }
-}
-
-impl Write for RawWriter<'_> {
-    fn write_str(&mut self, s: &str) -> fmt::Result {
-        let bytes = s.as_bytes();
-        let len = bytes.len();
-
-        // We do not want to overwrite our null terminator
-        if self.pos + len > self.buffer.len() - 1 {
-            return Err(fmt::Error);
-        }
-
-        // INVARIANT: We are not overwriting the last byte
-        self.buffer[self.pos..self.pos + len].copy_from_slice(bytes);
-
-        self.pos += len;
-
-        Ok(())
-    }
-}

-- 
2.47.2



  parent reply	other threads:[~2025-07-08 19:46 UTC|newest]

Thread overview: 27+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-07-08 19:44 [PATCH v2 00/14] rnull: add configfs, remote completion to rnull Andreas Hindborg
2025-07-08 19:44 ` [PATCH v2 01/14] rust: str: normalize imports in `str.rs` Andreas Hindborg
2025-07-09 13:26   ` Alice Ryhl
2025-07-08 19:44 ` [PATCH v2 02/14] rust: str: introduce `BorrowFormatter` Andreas Hindborg
2025-07-09 13:14   ` Alice Ryhl
2025-07-09 15:11     ` Andreas Hindborg
2025-07-08 19:44 ` [PATCH v2 03/14] rust: str: introduce `NullBorrowFormatter` Andreas Hindborg
2025-07-09 13:23   ` Alice Ryhl
2025-07-09 15:49     ` Andreas Hindborg
2025-07-10  8:47       ` Alice Ryhl
2025-07-10 11:01         ` Andreas Hindborg
2025-07-08 19:44 ` [PATCH v2 04/14] rust: block: normalize imports for `gen_disk.rs` Andreas Hindborg
2025-07-09 13:26   ` Alice Ryhl
2025-07-08 19:45 ` [PATCH v2 05/14] rust: block: use `NullBorrowFormatter` Andreas Hindborg
2025-07-09 13:25   ` Alice Ryhl
2025-07-11  9:29     ` Andreas Hindborg
2025-07-11 10:02       ` Alice Ryhl
2025-07-08 19:45 ` Andreas Hindborg [this message]
2025-07-08 19:45 ` [PATCH v2 07/14] rust: block: remove trait bound from `mq::Request` definition Andreas Hindborg
2025-07-09 13:25   ` Alice Ryhl
2025-07-08 19:45 ` [PATCH v2 08/14] rust: block: add block related constants Andreas Hindborg
2025-07-08 19:45 ` [PATCH v2 09/14] rnull: move driver to separate directory Andreas Hindborg
2025-07-08 19:45 ` [PATCH v2 10/14] rnull: enable configuration via `configfs` Andreas Hindborg
2025-07-08 19:45 ` [PATCH v2 11/14] rust: block: add `GenDisk` private data support Andreas Hindborg
2025-07-08 19:45 ` [PATCH v2 12/14] rust: block: mq: fix spelling in a safety comment Andreas Hindborg
2025-07-08 19:45 ` [PATCH v2 13/14] rust: block: add remote completion to `Request` Andreas Hindborg
2025-07-08 19:45 ` [PATCH v2 14/14] rnull: add soft-irq completion support Andreas Hindborg

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=20250708-rnull-up-v6-16-v2-6-ab93c0ff429b@kernel.org \
    --to=a.hindborg@kernel.org \
    --cc=alex.gaynor@gmail.com \
    --cc=aliceryhl@google.com \
    --cc=axboe@kernel.dk \
    --cc=bjorn3_gh@protonmail.com \
    --cc=boqun.feng@gmail.com \
    --cc=dakr@kernel.org \
    --cc=gary@garyguo.net \
    --cc=linux-block@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lossin@kernel.org \
    --cc=ojeda@kernel.org \
    --cc=rust-for-linux@vger.kernel.org \
    --cc=tmgross@umich.edu \
    /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

all inboxes | Powered by JetHome®