From: Miguel Ojeda <ojeda@kernel.org>
To: Linus Torvalds <torvalds@linux-foundation.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org,
Jarkko Sakkinen <jarkko@kernel.org>,
Miguel Ojeda <ojeda@kernel.org>,
Daniel Latypov <dlatypov@google.com>,
Brendan Higgins <brendanhiggins@google.com>,
linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com
Subject: [PATCH v7 04/25] kunit: take `kunit_assert` as `const`
Date: Mon, 23 May 2022 04:01:17 +0200 [thread overview]
Message-ID: <20220523020209.11810-5-ojeda@kernel.org> (raw)
In-Reply-To: <20220523020209.11810-1-ojeda@kernel.org>
The `kunit_do_failed_assertion` function passes its
`struct kunit_assert` argument to `kunit_fail`. This one,
in turn, calls its `format` field passing the assert again
as a `const` pointer.
Therefore, the whole chain may be made `const`.
Reviewed-by: Daniel Latypov <dlatypov@google.com>
Reviewed-by: Brendan Higgins <brendanhiggins@google.com>
Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
---
This is a prerequisite patch, independently submitted at:
https://lore.kernel.org/lkml/20220502093625.GA23225@kernel.org/
include/kunit/test.h | 2 +-
lib/kunit/test.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/kunit/test.h b/include/kunit/test.h
index 00b9ff7783ab..2eff4f1beb42 100644
--- a/include/kunit/test.h
+++ b/include/kunit/test.h
@@ -774,7 +774,7 @@ void __printf(2, 3) kunit_log_append(char *log, const char *fmt, ...);
void kunit_do_failed_assertion(struct kunit *test,
const struct kunit_loc *loc,
enum kunit_assert_type type,
- struct kunit_assert *assert,
+ const struct kunit_assert *assert,
const char *fmt, ...);
#define KUNIT_ASSERTION(test, assert_type, pass, assert_class, INITIALIZER, fmt, ...) do { \
diff --git a/lib/kunit/test.c b/lib/kunit/test.c
index 3bca3bf5c15b..b84aed09a009 100644
--- a/lib/kunit/test.c
+++ b/lib/kunit/test.c
@@ -241,7 +241,7 @@ static void kunit_print_string_stream(struct kunit *test,
}
static void kunit_fail(struct kunit *test, const struct kunit_loc *loc,
- enum kunit_assert_type type, struct kunit_assert *assert,
+ enum kunit_assert_type type, const struct kunit_assert *assert,
const struct va_format *message)
{
struct string_stream *stream;
@@ -281,7 +281,7 @@ static void __noreturn kunit_abort(struct kunit *test)
void kunit_do_failed_assertion(struct kunit *test,
const struct kunit_loc *loc,
enum kunit_assert_type type,
- struct kunit_assert *assert,
+ const struct kunit_assert *assert,
const char *fmt, ...)
{
va_list args;
--
2.36.1
next prev parent reply other threads:[~2022-05-23 2:03 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-23 2:01 [PATCH v7 00/25] Rust support Miguel Ojeda
2022-05-23 2:01 ` [PATCH v7 01/25] kallsyms: avoid hardcoding the buffer size Miguel Ojeda
2022-05-23 19:45 ` Jarkko Sakkinen
2022-05-23 19:55 ` Jarkko Sakkinen
2022-05-24 16:21 ` Miguel Ojeda
2022-05-26 4:54 ` Jarkko Sakkinen
2022-05-23 2:01 ` [PATCH v7 02/25] kallsyms: support "big" kernel symbols Miguel Ojeda
2022-05-23 20:30 ` Jarkko Sakkinen
2022-05-23 2:01 ` [PATCH v7 03/25] kallsyms: increase maximum kernel symbol length to 512 Miguel Ojeda
2022-05-23 20:31 ` Jarkko Sakkinen
2022-05-24 18:07 ` Miguel Ojeda
2022-05-27 16:25 ` Jarkko Sakkinen
2022-05-30 13:01 ` Miguel Ojeda
2022-05-23 2:01 ` Miguel Ojeda [this message]
2022-05-23 17:15 ` [PATCH v7 04/25] kunit: take `kunit_assert` as `const` Daniel Latypov
2022-05-23 18:14 ` Shuah Khan
2022-05-24 12:37 ` Miguel Ojeda
2022-05-23 2:01 ` [PATCH v7 05/25] rust: add C helpers Miguel Ojeda
2022-05-23 2:01 ` [PATCH v7 06/25] rust: add `compiler_builtins` crate Miguel Ojeda
2022-05-23 18:37 ` Nick Desaulniers
2022-05-23 23:41 ` Gary Guo
2022-05-25 21:29 ` Nick Desaulniers
2022-05-24 12:29 ` Miguel Ojeda
2022-05-23 2:01 ` [PATCH v7 08/25] rust: adapt `alloc` crate to the kernel Miguel Ojeda
2022-05-23 2:01 ` [PATCH v7 09/25] rust: add `build_error` crate Miguel Ojeda
2022-05-23 2:01 ` [PATCH v7 10/25] rust: add `macros` crate Miguel Ojeda
2022-05-23 2:01 ` [PATCH v7 13/25] rust: export generated symbols Miguel Ojeda
2022-05-23 2:01 ` [PATCH v7 14/25] vsprintf: add new `%pA` format specifier Miguel Ojeda
2022-05-23 2:01 ` [PATCH v7 15/25] scripts: checkpatch: diagnose uses of `%pA` in the C side Miguel Ojeda
2022-05-23 2:17 ` Joe Perches
2022-05-24 16:35 ` Miguel Ojeda
2022-05-23 2:01 ` [PATCH v7 16/25] scripts: checkpatch: enable language-independent checks for Rust Miguel Ojeda
2022-05-23 2:01 ` [PATCH v7 17/25] scripts: add `rustdoc_test_{builder,gen}.py` scripts Miguel Ojeda
2022-05-23 2:01 ` [PATCH v7 18/25] scripts: add `generate_rust_analyzer.py` scripts Miguel Ojeda
2022-05-23 2:01 ` [PATCH v7 19/25] scripts: decode_stacktrace: demangle Rust symbols Miguel Ojeda
2022-05-23 2:01 ` [PATCH v7 20/25] docs: add Rust documentation Miguel Ojeda
2022-05-23 2:01 ` [PATCH v7 21/25] Kbuild: add Rust support Miguel Ojeda
2022-05-23 18:44 ` Nick Desaulniers
2022-05-24 15:12 ` Miguel Ojeda
2022-05-25 22:25 ` Nick Desaulniers
2022-05-30 13:39 ` Miguel Ojeda
2022-07-16 8:21 ` Masahiro Yamada
2022-07-16 8:57 ` Miguel Ojeda
2022-05-23 2:01 ` [PATCH v7 22/25] samples: add Rust examples Miguel Ojeda
2022-05-23 2:01 ` [PATCH v7 23/25] MAINTAINERS: Rust Miguel Ojeda
2022-05-23 2:01 ` [PATCH v7 24/25] [RFC] drivers: gpio: PrimeCell PL061 in Rust Miguel Ojeda
2022-07-16 12:42 ` [PATCH v7 00/25] Rust support Conor Dooley
2022-07-16 13:36 ` Miguel Ojeda
2022-07-16 13:51 ` Conor.Dooley
2022-07-16 13:56 ` Miguel Ojeda
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=20220523020209.11810-5-ojeda@kernel.org \
--to=ojeda@kernel.org \
--cc=brendanhiggins@google.com \
--cc=dlatypov@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=jarkko@kernel.org \
--cc=kunit-dev@googlegroups.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-kselftest@vger.kernel.org \
--cc=rust-for-linux@vger.kernel.org \
--cc=torvalds@linux-foundation.org \
/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;
as well as URLs for NNTP newsgroup(s).