From patchwork Wed Apr 5 19:35:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: y86-dev X-Patchwork-Id: 79875 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp546419vqo; Wed, 5 Apr 2023 12:38:29 -0700 (PDT) X-Google-Smtp-Source: AKy350b74XJ05Pzl7mRbO2mHhVeoUkOQ0HJLUsXdYjC6ycLshp2z+vcv+G7qplVakoNIqqWu470D X-Received: by 2002:a62:1d41:0:b0:62a:4503:53b8 with SMTP id d62-20020a621d41000000b0062a450353b8mr6861598pfd.1.1680723509246; Wed, 05 Apr 2023 12:38:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680723509; cv=none; d=google.com; s=arc-20160816; b=hyy9yUS+VBCY8ZmqBBmcBzPDbKinvGJLXYzQTeWuxHYOZGlIMive6U8kaum/WkxoZJ 2Ph5XSjx2JJaPoesF8gzIlN0npo2VRGva8KDvyFGWb5gBBTljvTioc+jWQnOPYu3WWc9 rA08trktICGmQ37fePIqIJignSB7ldufIB9/TLZO0393ldDl+Weyw9zrJ8ObIk1q29oX f3y6VwCW6lW5pJNTDa4jn7478pQnF6fWz0yZoCe9trQA9d0Za7f06FY7opOT/Xop84kf biNYedpS40XavDE7Z59C2SghMWgN4mp42aZbXedxxQ4IZgTCcV8WNqT2FDjPU8MYlQo6 4ztg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :feedback-id:references:in-reply-to:message-id:subject:cc:from:to :dkim-signature:date; bh=/3m6gBMij6Ax7PcQaOILDRRx86A/6McrrYe3eb+j60U=; b=Cb3MQzqENidJM6f0LZC/IzqGDg0yks0wQ00huZdSkOrUd+uznVvzNj1TFrkE7e02ag 42jlrKubbiRbOCqj6HRCBqwMfuIRC+5TEQGVudZA0WsH7cGOa0ABvcw7AE9CyjieRsbK 9tX0hln3G0esVNTa/l0zB44dirprMedbTmVbjxdJCoLy6VBLBjo4lcCS1BBTHpvTACDu XFQgJYVl50uSrDL9/gfb3B14TgD8f+NRb/VaZx4Vh/asU5PR/FqgydsiCysTxMOE5LBu +ifeIest1ZiL9S+1sEqzzHqaE71Vc7O3Vz3hEjlxKobCv0ZHrZavXwMtUjcw3awl175P YahA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@protonmail.com header.s=protonmail3 header.b=d5UfZ3bO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=protonmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 129-20020a620587000000b006260aac226csi12936796pff.369.2023.04.05.12.38.16; Wed, 05 Apr 2023 12:38:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@protonmail.com header.s=protonmail3 header.b=d5UfZ3bO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=protonmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233431AbjDETgB (ORCPT + 99 others); Wed, 5 Apr 2023 15:36:01 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53836 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233160AbjDETf5 (ORCPT ); Wed, 5 Apr 2023 15:35:57 -0400 Received: from mail-4322.protonmail.ch (mail-4322.protonmail.ch [185.70.43.22]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2DD0665A6; Wed, 5 Apr 2023 12:35:53 -0700 (PDT) Date: Wed, 05 Apr 2023 19:35:47 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1680723351; x=1680982551; bh=/3m6gBMij6Ax7PcQaOILDRRx86A/6McrrYe3eb+j60U=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=d5UfZ3bOq8HhPP+stoilwMW+1Gwq/mN7HWJhmR+DzEOP7+jOZScHJaoU0RLORcrSo b27+pNIWMk2q5iDrnfUueRCAuLsc+94p3nquMLIdamW9dAPu/vKRxfOGpvTZIhzCZ2 2PnsqfKZUjrOcnnR7u+LTQFl/CJU28DBs6DNRUWwP1OB/Lfvw80VUShqIsvuQ6T0HZ TehbYVMMxqSXg2tQGxCsyiKgfoGGYwRnzcdzY4h7J6pVK1Dm3nWAHeq7xRJanuqIWX diCA3Io77s/t+JIlfQjKKJrVF5c7XzuinbQfxe6WLwxPgIweAK3CELvYPDBdYvkcpg KCsOGNZGA9LBg== To: Miguel Ojeda , Alex Gaynor , Wedson Almeida Filho , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Alice Ryhl , Andreas Hindborg From: Benno Lossin Cc: rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, Benno Lossin , Andreas Hindborg , Alice Ryhl Subject: [PATCH v6 03/15] rust: sync: change error type of constructor functions Message-ID: <20230405193445.745024-4-y86-dev@protonmail.com> In-Reply-To: <20230405193445.745024-1-y86-dev@protonmail.com> References: <20230405193445.745024-1-y86-dev@protonmail.com> Feedback-ID: 40624463:user:proton MIME-Version: 1.0 X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1762366334312995594?= X-GMAIL-MSGID: =?utf-8?q?1762366334312995594?= 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 Reviewed-by: Andreas Hindborg Reviewed-by: Alice Ryhl Reviewed-by: Gary Guo --- rust/kernel/sync/arc.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -- 2.39.2 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 Sync for Arc {} impl Arc { /// Constructs a new reference counted instance of `T`. - pub fn try_new(contents: T) -> Result { + pub fn try_new(contents: T) -> Result { // 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 { impl UniqueArc { /// Tries to allocate a new [`UniqueArc`] instance. - pub fn try_new(value: T) -> Result { + pub fn try_new(value: T) -> Result { Ok(Self { // INVARIANT: The newly-created object has a ref-count of 1. inner: Arc::try_new(value)?, @@ -477,7 +477,7 @@ impl UniqueArc { } /// Tries to allocate a new [`UniqueArc`] instance whose contents are not initialised yet. - pub fn try_new_uninit() -> Result>> { + pub fn try_new_uninit() -> Result>, AllocError> { Ok(UniqueArc::> { // INVARIANT: The newly-created object has a ref-count of 1. inner: Arc::try_new(MaybeUninit::uninit())?,