From: Danilo Krummrich <dakr@kernel.org>
To: ojeda@kernel.org, alex.gaynor@gmail.com, wedsonaf@gmail.com,
boqun.feng@gmail.com, gary@garyguo.net, bjorn3_gh@protonmail.com,
benno.lossin@proton.me, a.hindborg@samsung.com,
aliceryhl@google.com, akpm@linux-foundation.org
Cc: daniel.almeida@collabora.com, faith.ekstrand@collabora.com,
boris.brezillon@collabora.com, lina@asahilina.net,
mcanal@igalia.com, zhiw@nvidia.com, cjia@nvidia.com,
jhubbard@nvidia.com, airlied@redhat.com, ajanulgu@redhat.com,
lyude@redhat.com, linux-kernel@vger.kernel.org,
rust-for-linux@vger.kernel.org, linux-mm@kvack.org,
Danilo Krummrich <dakr@kernel.org>
Subject: [PATCH v8 23/29] rust: error: check for config `test` in `Error::name`
Date: Tue, 1 Oct 2024 16:59:58 +0200 [thread overview]
Message-ID: <20241001150008.183102-24-dakr@kernel.org> (raw)
In-Reply-To: <20241001150008.183102-1-dakr@kernel.org>
Additional to `testlib` also check for `test` in `Error::name`. This is
required by a subsequent patch that (indirectly) uses `Error` in test
cases.
Reviewed-by: Alice Ryhl <aliceryhl@google.com>
Reviewed-by: Benno Lossin <benno.lossin@proton.me>
Reviewed-by: Gary Guo <gary@garyguo.net>
Signed-off-by: Danilo Krummrich <dakr@kernel.org>
---
rust/kernel/error.rs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/rust/kernel/error.rs b/rust/kernel/error.rs
index 81b4fc5cf21e..b71fdd0f54c2 100644
--- a/rust/kernel/error.rs
+++ b/rust/kernel/error.rs
@@ -143,7 +143,7 @@ pub(crate) fn to_ptr<T>(self) -> *mut T {
}
/// Returns a string representing the error, if one exists.
- #[cfg(not(testlib))]
+ #[cfg(not(any(test, testlib)))]
pub fn name(&self) -> Option<&'static CStr> {
// SAFETY: Just an FFI call, there are no extra safety requirements.
let ptr = unsafe { bindings::errname(-self.0) };
@@ -160,7 +160,7 @@ pub fn name(&self) -> Option<&'static CStr> {
/// When `testlib` is configured, this always returns `None` to avoid the dependency on a
/// kernel function so that tests that use this (e.g., by calling [`Result::unwrap`]) can still
/// run in userspace.
- #[cfg(testlib)]
+ #[cfg(any(test, testlib))]
pub fn name(&self) -> Option<&'static CStr> {
None
}
--
2.46.1
next prev parent reply other threads:[~2024-10-01 15:02 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-10-01 14:59 [PATCH v8 00/29] Generic `Allocator` support for Rust Danilo Krummrich
2024-10-01 14:59 ` [PATCH v8 01/29] rust: alloc: add `Allocator` trait Danilo Krummrich
2024-10-01 18:24 ` Gary Guo
2024-10-02 14:59 ` Benno Lossin
2024-10-01 14:59 ` [PATCH v8 02/29] rust: alloc: separate `aligned_size` from `krealloc_aligned` Danilo Krummrich
2024-10-01 14:59 ` [PATCH v8 03/29] rust: alloc: rename `KernelAllocator` to `Kmalloc` Danilo Krummrich
2024-10-01 14:59 ` [PATCH v8 04/29] rust: alloc: implement `ReallocFunc` Danilo Krummrich
2024-10-01 16:11 ` Benno Lossin
2024-10-01 18:25 ` Gary Guo
2024-10-01 14:59 ` [PATCH v8 05/29] rust: alloc: make `allocator` module public Danilo Krummrich
2024-10-01 16:01 ` Benno Lossin
2024-10-01 18:25 ` Gary Guo
2024-10-01 14:59 ` [PATCH v8 06/29] rust: alloc: implement `Allocator` for `Kmalloc` Danilo Krummrich
2024-10-01 16:01 ` Benno Lossin
2024-10-01 18:26 ` Gary Guo
2024-10-01 14:59 ` [PATCH v8 07/29] rust: alloc: add module `allocator_test` Danilo Krummrich
2024-10-01 14:59 ` [PATCH v8 08/29] rust: alloc: implement `Vmalloc` allocator Danilo Krummrich
2024-10-01 18:26 ` Gary Guo
2024-10-01 14:59 ` [PATCH v8 09/29] rust: alloc: implement `KVmalloc` allocator Danilo Krummrich
2024-10-01 18:27 ` Gary Guo
2024-10-01 14:59 ` [PATCH v8 10/29] rust: alloc: add __GFP_NOWARN to `Flags` Danilo Krummrich
2024-10-01 14:59 ` [PATCH v8 11/29] rust: alloc: implement kernel `Box` Danilo Krummrich
2024-10-01 18:28 ` Gary Guo
2024-10-03 23:00 ` Miguel Ojeda
2024-10-04 12:04 ` Danilo Krummrich
2024-10-01 14:59 ` [PATCH v8 12/29] rust: treewide: switch to our kernel `Box` type Danilo Krummrich
2024-10-01 14:59 ` [PATCH v8 13/29] rust: alloc: remove extension of std's `Box` Danilo Krummrich
2024-10-01 14:59 ` [PATCH v8 14/29] rust: alloc: add `Box` to prelude Danilo Krummrich
2024-10-01 14:59 ` [PATCH v8 15/29] rust: alloc: introduce `ArrayLayout` Danilo Krummrich
2024-10-01 18:31 ` Gary Guo
2024-10-03 0:27 ` kernel test robot
2024-10-01 14:59 ` [PATCH v8 16/29] rust: alloc: implement kernel `Vec` type Danilo Krummrich
2024-10-01 18:39 ` Gary Guo
2024-10-02 15:02 ` Benno Lossin
2024-10-02 15:20 ` Danilo Krummrich
2024-10-02 19:04 ` Benno Lossin
2024-10-01 14:59 ` [PATCH v8 17/29] rust: alloc: implement `IntoIterator` for `Vec` Danilo Krummrich
2024-10-01 14:59 ` [PATCH v8 18/29] rust: alloc: implement `collect` for `IntoIter` Danilo Krummrich
2024-10-01 14:59 ` [PATCH v8 19/29] rust: treewide: switch to the kernel `Vec` type Danilo Krummrich
2024-10-01 14:59 ` [PATCH v8 20/29] rust: alloc: remove `VecExt` extension Danilo Krummrich
2024-10-01 14:59 ` [PATCH v8 21/29] rust: alloc: add `Vec` to prelude Danilo Krummrich
2024-10-01 14:59 ` [PATCH v8 22/29] rust: error: use `core::alloc::LayoutError` Danilo Krummrich
2024-10-01 14:59 ` Danilo Krummrich [this message]
2024-10-01 14:59 ` [PATCH v8 24/29] rust: alloc: implement `contains` for `Flags` Danilo Krummrich
2024-10-01 15:00 ` [PATCH v8 25/29] rust: alloc: implement `Cmalloc` in module allocator_test Danilo Krummrich
2024-10-02 14:58 ` Benno Lossin
2024-10-02 20:37 ` Gary Guo
2024-10-01 15:00 ` [PATCH v8 26/29] rust: str: test: replace `alloc::format` Danilo Krummrich
2024-10-01 15:00 ` [PATCH v8 27/29] rust: alloc: update module comment of alloc.rs Danilo Krummrich
2024-10-01 15:00 ` [PATCH v8 28/29] kbuild: rust: remove the `alloc` crate and `GlobalAlloc` Danilo Krummrich
2024-10-01 15:00 ` [PATCH v8 29/29] MAINTAINERS: add entry for the Rust `alloc` module Danilo Krummrich
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=20241001150008.183102-24-dakr@kernel.org \
--to=dakr@kernel.org \
--cc=a.hindborg@samsung.com \
--cc=airlied@redhat.com \
--cc=ajanulgu@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=alex.gaynor@gmail.com \
--cc=aliceryhl@google.com \
--cc=benno.lossin@proton.me \
--cc=bjorn3_gh@protonmail.com \
--cc=boqun.feng@gmail.com \
--cc=boris.brezillon@collabora.com \
--cc=cjia@nvidia.com \
--cc=daniel.almeida@collabora.com \
--cc=faith.ekstrand@collabora.com \
--cc=gary@garyguo.net \
--cc=jhubbard@nvidia.com \
--cc=lina@asahilina.net \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=lyude@redhat.com \
--cc=mcanal@igalia.com \
--cc=ojeda@kernel.org \
--cc=rust-for-linux@vger.kernel.org \
--cc=wedsonaf@gmail.com \
--cc=zhiw@nvidia.com \
/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).