Commit 14865543 authored May 26, 2025 by Miguel Ojeda

rust: str: simplify KUnit tests `format!` macro



Simplify the `format!` macro used in the tests by using
`CString::try_from_fmt` and directly `unwrap()`ing.

This will allow us to change both `unwrap()`s here in order to showcase
the `?` operator support now that the tests are KUnit ones.

Reviewed-by: David Gow <davidgow@google.com>
Acked-by: Danilo Krummrich <dakr@kernel.org>
[ Split from the next commit as suggested by Tamir. - Miguel ]
Signed-off-by: Miguel Ojeda <ojeda@kernel.org>

parent 028df914

rust/kernel/str.rs

+1 −17

Original line number	Diff line number	Diff line
		@@ -576,25 +576,9 @@ macro_rules! c_str {
		mod tests {
		use super::*;

		struct String(CString);

		impl String {
		fn from_fmt(args: fmt::Arguments<'_>) -> Self {
		String(CString::try_from_fmt(args).unwrap())
		}
		}

		impl Deref for String {
		type Target = str;

		fn deref(&self) -> &str {
		self.0.to_str().unwrap()
		}
		}

		macro_rules! format {
		($($f:tt)*) => ({
		&String::from_fmt(::kernel::fmt!($($f)))
		CString::try_from_fmt(::kernel::fmt!($($f)*)).unwrap().to_str().unwrap()
		})
		}