Commit f16a2374 authored by Tamir Duberstein's avatar Tamir Duberstein Committed by Miguel Ojeda
Browse files

rust: kunit: use `core::ffi::CStr` method names 

Prepare for `core::ffi::CStr` taking the place of `kernel::str::CStr` by
avoid methods that only exist on the latter.

Link: https://github.com/Rust-for-Linux/linux/issues/1075


Acked-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Reviewed-by: default avatarAlice Ryhl <aliceryhl@google.com>
Reviewed-by: default avatarBenno Lossin <lossin@kernel.org>
Signed-off-by: default avatarTamir Duberstein <tamird@gmail.com>
Signed-off-by: default avatarMiguel Ojeda <ojeda@kernel.org>
parent 141ba59c

rust/kernel/kunit.rs

+3 −3
Original line number Diff line number Diff line
@@ -102,12 +102,12 @@ unsafe impl Sync for Location {} 
            unsafe impl Sync for UnaryAssert {}



            static LOCATION: Location = Location($crate::bindings::kunit_loc {

                file: FILE.as_char_ptr(),

                file: $crate::str::as_char_ptr_in_const_context(FILE),

                line: LINE,

            });

            static ASSERTION: UnaryAssert = UnaryAssert($crate::bindings::kunit_unary_assert {

                assert: $crate::bindings::kunit_assert {},

                condition: CONDITION.as_char_ptr(),

                condition: $crate::str::as_char_ptr_in_const_context(CONDITION),

                expected_true: true,

            });
@@ -202,7 +202,7 @@ pub const fn kunit_case( 
) -> kernel::bindings::kunit_case {

    kernel::bindings::kunit_case {

        run_case: Some(run_case),

        name: name.as_char_ptr(),

        name: kernel::str::as_char_ptr_in_const_context(name),

        attr: kernel::bindings::kunit_attributes {

            speed: kernel::bindings::kunit_speed_KUNIT_SPEED_NORMAL,

        },