From: Benno Lossin <y86-dev@protonmail.com>
To: "Miguel Ojeda" <ojeda@kernel.org>,
"Alex Gaynor" <alex.gaynor@gmail.com>,
"Wedson Almeida Filho" <wedsonaf@gmail.com>,
"Boqun Feng" <boqun.feng@gmail.com>,
"Gary Guo" <gary@garyguo.net>,
"Björn Roy Baron" <bjorn3_gh@protonmail.com>,
"Alice Ryhl" <alice@ryhl.io>,
"Andreas Hindborg" <nmi@metaspace.dk>
Cc: rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org,
patches@lists.linux.dev, Benno Lossin <y86-dev@protonmail.com>,
Andreas Hindborg <a.hindborg@samsung.com>,
Alice Ryhl <aliceryhl@google.com>
Subject: [PATCH v7 03/15] rust: sync: change error type of constructor functions
Date: Sat, 08 Apr 2023 12:25:29 +0000 [thread overview]
Message-ID: <20230408122429.1103522-4-y86-dev@protonmail.com> (raw)
In-Reply-To: <20230408122429.1103522-1-y86-dev@protonmail.com>
Change the error type of the constructors of `Arc` and `UniqueArc` to be
`AllocError` instead of `Error`. This makes the API more clear as to
what can go wrong when calling `try_new` or its variants.
Signed-off-by: Benno Lossin <y86-dev@protonmail.com>
Reviewed-by: Andreas Hindborg <a.hindborg@samsung.com>
Reviewed-by: Alice Ryhl <aliceryhl@google.com>
Reviewed-by: Gary Guo <gary@garyguo.net>
---
rust/kernel/sync/arc.rs | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/rust/kernel/sync/arc.rs b/rust/kernel/sync/arc.rs
index f2f1c83d72ba..aa7135f0f238 100644
--- a/rust/kernel/sync/arc.rs
+++ b/rust/kernel/sync/arc.rs
@@ -17,11 +17,11 @@
use crate::{
bindings,
- error::Result,
types::{ForeignOwnable, Opaque},
};
use alloc::boxed::Box;
use core::{
+ alloc::AllocError,
marker::{PhantomData, Unsize},
mem::{ManuallyDrop, MaybeUninit},
ops::{Deref, DerefMut},
@@ -149,7 +149,7 @@ unsafe impl<T: ?Sized + Sync + Send> Sync for Arc<T> {}
impl<T> Arc<T> {
/// Constructs a new reference counted instance of `T`.
- pub fn try_new(contents: T) -> Result<Self> {
+ pub fn try_new(contents: T) -> Result<Self, AllocError> {
// INVARIANT: The refcount is initialised to a non-zero value.
let value = ArcInner {
// SAFETY: There are no safety requirements for this FFI call.
@@ -469,7 +469,7 @@ pub struct UniqueArc<T: ?Sized> {
impl<T> UniqueArc<T> {
/// Tries to allocate a new [`UniqueArc`] instance.
- pub fn try_new(value: T) -> Result<Self> {
+ pub fn try_new(value: T) -> Result<Self, AllocError> {
Ok(Self {
// INVARIANT: The newly-created object has a ref-count of 1.
inner: Arc::try_new(value)?,
@@ -477,7 +477,7 @@ impl<T> UniqueArc<T> {
}
/// Tries to allocate a new [`UniqueArc`] instance whose contents are not initialised yet.
- pub fn try_new_uninit() -> Result<UniqueArc<MaybeUninit<T>>> {
+ pub fn try_new_uninit() -> Result<UniqueArc<MaybeUninit<T>>, AllocError> {
Ok(UniqueArc::<MaybeUninit<T>> {
// INVARIANT: The newly-created object has a ref-count of 1.
inner: Arc::try_new(MaybeUninit::uninit())?,
--
2.39.2
next prev parent reply other threads:[~2023-04-08 12:25 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-08 12:25 [PATCH v7 00/15] Rust pin-init API for pinned initialization of structs Benno Lossin
2023-04-08 12:25 ` [PATCH v7 01/15] rust: enable the `pin_macro` feature Benno Lossin
2023-04-08 12:25 ` [PATCH v7 02/15] rust: macros: add `quote!` macro Benno Lossin
2023-04-08 12:25 ` Benno Lossin [this message]
2023-04-08 12:25 ` [PATCH v7 04/15] rust: sync: add `assume_init` to `UniqueArc` Benno Lossin
2023-04-08 12:25 ` [PATCH v7 05/15] rust: types: add `Opaque::raw_get` Benno Lossin
2023-04-08 12:25 ` [PATCH v7 06/15] rust: add pin-init API core Benno Lossin
2023-04-08 12:25 ` [PATCH v7 07/15] rust: init: add initialization macros Benno Lossin
2023-04-08 12:25 ` [PATCH v7 08/15] rust: init/sync: add `InPlaceInit` trait to pin-initialize smart pointers Benno Lossin
2023-04-08 12:26 ` [PATCH v7 09/15] rust: init: add `PinnedDrop` trait and macros Benno Lossin
2023-04-08 12:26 ` [PATCH v7 10/15] rust: init: add `stack_pin_init!` macro Benno Lossin
2023-04-08 12:26 ` [PATCH v7 11/15] rust: init: add `Zeroable` trait and `init::zeroed` function Benno Lossin
2023-04-08 12:26 ` [PATCH v7 12/15] rust: prelude: add `pin-init` API items to prelude Benno Lossin
2023-04-08 12:26 ` [PATCH v7 13/15] rust: types: add `Opaque::ffi_init` Benno Lossin
2023-04-08 15:21 ` Andreas Hindborg
2023-04-11 8:12 ` Alice Ryhl
2023-04-08 12:26 ` [PATCH v7 14/15] rust: sync: reduce stack usage of `UniqueArc::try_new_uninit` Benno Lossin
2023-04-08 12:26 ` [PATCH v7 15/15] rust: sync: add functions for initializing `UniqueArc<MaybeUninit<T>>` Benno Lossin
2023-04-10 22:54 ` [PATCH v7 00/15] Rust pin-init API for pinned initialization of structs Miguel Ojeda
2023-04-12 20:13 ` y86-dev
2023-04-12 20:15 ` 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=20230408122429.1103522-4-y86-dev@protonmail.com \
--to=y86-dev@protonmail.com \
--cc=a.hindborg@samsung.com \
--cc=alex.gaynor@gmail.com \
--cc=alice@ryhl.io \
--cc=aliceryhl@google.com \
--cc=bjorn3_gh@protonmail.com \
--cc=boqun.feng@gmail.com \
--cc=gary@garyguo.net \
--cc=linux-kernel@vger.kernel.org \
--cc=nmi@metaspace.dk \
--cc=ojeda@kernel.org \
--cc=patches@lists.linux.dev \
--cc=rust-for-linux@vger.kernel.org \
--cc=wedsonaf@gmail.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