mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-10-30 16:18:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

rust: kunit: use kernel::{fmt,prelude::fmt!}

Browse source 
Reduce coupling to implementation details of the formatting machinery by
avoiding direct use for `core`'s formatting traits and macros.

Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: Alice Ryhl <aliceryhl@google.com>
Reviewed-by: Benno Lossin <lossin@kernel.org>
Signed-off-by: Tamir Duberstein <tamird@gmail.com>
Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
This commit is contained in:
Tamir Duberstein 2025-08-13 11:39:51 -04:00 committed by Miguel Ojeda
parent e6aedde22d
commit aa2417c1a5
2 changed files with 5 additions and 5 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

8
rust/kernel/kunit.rs
View file

@ -6,8 +6,8 @@
//! //!
//! Reference: <https://docs.kernel.org/dev-tools/kunit/index.html> //! Reference: <https://docs.kernel.org/dev-tools/kunit/index.html>
use crate::fmt;
use crate::prelude::*; use crate::prelude::*;
use core::fmt;
#[cfg(CONFIG_PRINTK)] #[cfg(CONFIG_PRINTK)]
use crate::c_str; use crate::c_str;
@ -74,14 +74,14 @@ macro_rules! kunit_assert {
// mistake (it is hidden to prevent that). // mistake (it is hidden to prevent that).
// //
// This mimics KUnit's failed assertion format. // This mimics KUnit's failed assertion format.
$crate::kunit::err(format_args!( $crate::kunit::err($crate::prelude::fmt!(
" # {}: ASSERTION FAILED at {FILE}:{LINE}\n", " # {}: ASSERTION FAILED at {FILE}:{LINE}\n",
$name $name
)); ));
$crate::kunit::err(format_args!( $crate::kunit::err($crate::prelude::fmt!(
" Expected {CONDITION} to be true, but is false\n" " Expected {CONDITION} to be true, but is false\n"
)); ));
$crate::kunit::err(format_args!( $crate::kunit::err($crate::prelude::fmt!(
" Failure not reported to KUnit since this is a non-KUnit task\n" " Failure not reported to KUnit since this is a non-KUnit task\n"
)); ));
break 'out; break 'out;

2
scripts/rustdoc_test_gen.rs
View file

@ -202,7 +202,7 @@ macro_rules! assert_eq {{
// This follows the syntax for declaring test metadata in the proposed KTAP v2 spec, which may // This follows the syntax for declaring test metadata in the proposed KTAP v2 spec, which may
// be used for the proposed KUnit test attributes API. Thus hopefully this will make migration // be used for the proposed KUnit test attributes API. Thus hopefully this will make migration
// easier later on. // easier later on.
::kernel::kunit::info(format_args!(" # {kunit_name}.location: {real_path}:{line}\n")); ::kernel::kunit::info(fmt!(" # {kunit_name}.location: {real_path}:{line}\n"));
/// The anchor where the test code body starts. /// The anchor where the test code body starts.
#[allow(unused)] #[allow(unused)]