Message ID | 20230418214347.324156-3-ojeda@kernel.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp3159902vqo; Tue, 18 Apr 2023 15:16:00 -0700 (PDT) X-Google-Smtp-Source: AKy350ZD8zxJwNAuHuujK0STZnIY4TMRqG5wE4m4eU6FC+yn9MlB99ktKjKGop7Ysw71eeDMvxHi X-Received: by 2002:a17:903:32c7:b0:1a6:7ea8:9f4f with SMTP id i7-20020a17090332c700b001a67ea89f4fmr272128plr.26.1681856159923; Tue, 18 Apr 2023 15:15:59 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681856159; cv=none; d=google.com; s=arc-20160816; b=IBZiDmvB5dpPLvX+fUslpCqGRClUIH3cZ4V77gzAaT+ttYcOSuINfAhTNuRl85C5C5 5L4qA8ZsLVdTSHtdobyQWPjRKdFFD481sB36Yu6r7GPqp+UVtdxRwsD1Q83mI1S9uBAR 6T7MRYbMgekEvcpv0u+VWsfQWu6EfwtbTq5KY+3YeAKmBdrCjMYWvnOh/rcHl1zDTwSN 3lCTI6iiM6PFbzuEy89nh0LRWrrm8o8nhTToemlBmwcxfAfw0HD+2c5d765RkWUqac3y JvV01HinMnqhkGNc6i4ez8jxIQKv7piFuKAIPEBhmsRnuGeMJjM2ndO77aMjIWe7yUkL 9TmQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=D7yFEAUhtPrlDIw5CcRn3o4k1ycav7xmdCNRXWOUKzE=; b=kjQK4/oCsZRsdw/I1m/Wl3H1UkajeMX3e6hDZ17INxkVb7hDtcQQo/L2406rTxa2DQ SaiGr8r5TfIKy4Oy5LA4o6OefWOwFOxplI4lgvfgQGsGKxUqyjcHCXV8B2QtJKKyr3PX VVoprfcvWXwB8JrxqBI+XOy+S/X7VCeniaw0IZ9NdQuJLgmUumv6IXFp3JI4K2o+E7E9 qwM736PuJ0FI7vErQLx5KsCzXi4ormV9Chh7X3dXxbUnayHZq7X0WITnCQ42UOkBse3H 2ZCYcY4uc7YKShOJHhoC0ibcVYgH1Q3pAg0si2T/B6B4wu7byffgazAS4RGGucq4yuK+ ue+g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=pzQSEkJz; 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=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y6-20020a17090322c600b001a642057764si15500655plg.180.2023.04.18.15.15.45; Tue, 18 Apr 2023 15:15:59 -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=@kernel.org header.s=k20201202 header.b=pzQSEkJz; 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=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233051AbjDRVon (ORCPT <rfc822;peter110.wang@gmail.com> + 99 others); Tue, 18 Apr 2023 17:44:43 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59188 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232946AbjDRVoj (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Tue, 18 Apr 2023 17:44:39 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A135849FD; Tue, 18 Apr 2023 14:44:36 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 27BA463972; Tue, 18 Apr 2023 21:44:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8AD04C4339E; Tue, 18 Apr 2023 21:44:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1681854275; bh=dxHo8fng5fKFUsmtr5U2E97vDNeCPOyudAHUgofO3Ow=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pzQSEkJzeinJqr/xLkeLsbod8v/LF8j9j1o3R4KhOtcMDbcfdi2dPjR0Qfr+FlcBP fZ1/hjf+pLrZSqLXhDjPDrCof1m2Ct0b7+2k+nwb5r+4XJj4R4V3za+zUUvJMXNhq3 7OlFy+sJaXcfLBIvBwDmWPTJNJzQsolMCPf8De9Mlym9S71PJa9xWdKwZbNhud3jS5 cC3l659+12sptujUJmIjTidlA4J2sH8TQr+F0n1/O3pb+PubueNXSRbjASwj4aj9X9 j+lrGC0gUD8YhXNcb+fxfZE4vvpMhEct5F9/9bztS6x5AuoL/zLbbYm5oNcrKGLGSU I8rtbhExZhwAg== From: Miguel Ojeda <ojeda@kernel.org> To: Miguel Ojeda <ojeda@kernel.org>, Wedson Almeida Filho <wedsonaf@gmail.com>, Alex Gaynor <alex.gaynor@gmail.com> Cc: Boqun Feng <boqun.feng@gmail.com>, Gary Guo <gary@garyguo.net>, =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= <bjorn3_gh@protonmail.com>, Benno Lossin <benno.lossin@proton.me>, Josh Stone <jistone@redhat.com>, William Brown <william.brown@suse.com>, Georgy Yakovlev <gyakovlev@gentoo.org>, Jan Alexander Steffens <jan.steffens@gmail.com>, rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev Subject: [PATCH 2/3] rust: arc: fix intra-doc link in `Arc<T>::init` Date: Tue, 18 Apr 2023 23:43:46 +0200 Message-Id: <20230418214347.324156-3-ojeda@kernel.org> In-Reply-To: <20230418214347.324156-1-ojeda@kernel.org> References: <20230418214347.324156-1-ojeda@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham 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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763554004971312842?= X-GMAIL-MSGID: =?utf-8?q?1763554004971312842?= |
Series |
Rust 1.68.2 upgrade
|
|
Commit Message
Miguel Ojeda
April 18, 2023, 9:43 p.m. UTC
`Arc<T>::init` refers to `Arc<T>::pin_init` via an intra-doc link
using the text `pin_init`, rather than more explicitly, which makes
`rustdoc` point it to the `pin_init!` macro instead.
This is required for the compiler upgrade since the newer `rustdoc`
would trigger the `broken_intra_doc_links` lint [1], but in this case
the macro was not the intended target to begin with, and so the actual
fix is to make it point to the right place, regardless of the upgrade.
Thus make it more explicit.
Fixes: 92c4a1e7e81c ("rust: init/sync: add `InPlaceInit` trait to pin-initialize smart pointers")
Link: https://github.com/rust-lang/rust/issues/106142 [1]
Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
---
rust/kernel/sync/arc.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Comments
On 4/18/23 18:43, Miguel Ojeda wrote: > `Arc<T>::init` refers to `Arc<T>::pin_init` via an intra-doc link > using the text `pin_init`, rather than more explicitly, which makes > `rustdoc` point it to the `pin_init!` macro instead. > > This is required for the compiler upgrade since the newer `rustdoc` > would trigger the `broken_intra_doc_links` lint [1], but in this case > the macro was not the intended target to begin with, and so the actual > fix is to make it point to the right place, regardless of the upgrade. > > Thus make it more explicit. > > Fixes: 92c4a1e7e81c ("rust: init/sync: add `InPlaceInit` trait to pin-initialize smart pointers") > Link: https://github.com/rust-lang/rust/issues/106142 [1] > Signed-off-by: Miguel Ojeda <ojeda@kernel.org> > --- > rust/kernel/sync/arc.rs | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/rust/kernel/sync/arc.rs b/rust/kernel/sync/arc.rs > index e6d206242465..1b0734fdf6a7 100644 > --- a/rust/kernel/sync/arc.rs > +++ b/rust/kernel/sync/arc.rs > @@ -185,7 +185,7 @@ impl<T> Arc<T> { > > /// Use the given initializer to in-place initialize a `T`. > /// > - /// This is equivalent to [`pin_init`], since an [`Arc`] is always pinned. > + /// This is equivalent to [`Arc<T>::pin_init`], since an [`Arc`] is always pinned. > #[inline] > pub fn init<E>(init: impl Init<T, E>) -> error::Result<Self> > where Reviewed-by: Martin Rodriguez Reboredo <yakoyoku@gmail.com>
On 18.04.23 23:43, Miguel Ojeda wrote: > `Arc<T>::init` refers to `Arc<T>::pin_init` via an intra-doc link > using the text `pin_init`, rather than more explicitly, which makes > `rustdoc` point it to the `pin_init!` macro instead. > > This is required for the compiler upgrade since the newer `rustdoc` > would trigger the `broken_intra_doc_links` lint [1], but in this case > the macro was not the intended target to begin with, and so the actual > fix is to make it point to the right place, regardless of the upgrade. > > Thus make it more explicit. > > Fixes: 92c4a1e7e81c ("rust: init/sync: add `InPlaceInit` trait to pin-initialize smart pointers") > Link: https://github.com/rust-lang/rust/issues/106142 [1] > Signed-off-by: Miguel Ojeda <ojeda@kernel.org> Reviewed-by: Benno Lossin <benno.lossin@proton.me> > --- > rust/kernel/sync/arc.rs | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/rust/kernel/sync/arc.rs b/rust/kernel/sync/arc.rs > index e6d206242465..1b0734fdf6a7 100644 > --- a/rust/kernel/sync/arc.rs > +++ b/rust/kernel/sync/arc.rs > @@ -185,7 +185,7 @@ impl<T> Arc<T> { > > /// Use the given initializer to in-place initialize a `T`. > /// > - /// This is equivalent to [`pin_init`], since an [`Arc`] is always pinned. > + /// This is equivalent to [`Arc<T>::pin_init`], since an [`Arc`] is always pinned. > #[inline] > pub fn init<E>(init: impl Init<T, E>) -> error::Result<Self> > where > -- > 2.40.0 >
On Tue, 18 Apr 2023 23:43:46 +0200 Miguel Ojeda <ojeda@kernel.org> wrote: > `Arc<T>::init` refers to `Arc<T>::pin_init` via an intra-doc link > using the text `pin_init`, rather than more explicitly, which makes > `rustdoc` point it to the `pin_init!` macro instead. > > This is required for the compiler upgrade since the newer `rustdoc` > would trigger the `broken_intra_doc_links` lint [1], but in this case > the macro was not the intended target to begin with, and so the actual > fix is to make it point to the right place, regardless of the upgrade. > > Thus make it more explicit. > > Fixes: 92c4a1e7e81c ("rust: init/sync: add `InPlaceInit` trait to pin-initialize smart pointers") > Link: https://github.com/rust-lang/rust/issues/106142 [1] > Signed-off-by: Miguel Ojeda <ojeda@kernel.org> Reviewed-by: Gary Guo <gary@garyguo.net> > --- > rust/kernel/sync/arc.rs | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/rust/kernel/sync/arc.rs b/rust/kernel/sync/arc.rs > index e6d206242465..1b0734fdf6a7 100644 > --- a/rust/kernel/sync/arc.rs > +++ b/rust/kernel/sync/arc.rs > @@ -185,7 +185,7 @@ impl<T> Arc<T> { > > /// Use the given initializer to in-place initialize a `T`. > /// > - /// This is equivalent to [`pin_init`], since an [`Arc`] is always pinned. > + /// This is equivalent to [`Arc<T>::pin_init`], since an [`Arc`] is always pinned. > #[inline] > pub fn init<E>(init: impl Init<T, E>) -> error::Result<Self> > where
On Tuesday, April 18th, 2023 at 23:43, Miguel Ojeda <ojeda@kernel.org> wrote: > `Arc<T>::init` refers to `Arc<T>::pin_init` via an intra-doc link > > using the text `pin_init`, rather than more explicitly, which makes > `rustdoc` point it to the `pin_init!` macro instead. > > This is required for the compiler upgrade since the newer `rustdoc` > would trigger the `broken_intra_doc_links` lint [1], but in this case > the macro was not the intended target to begin with, and so the actual > fix is to make it point to the right place, regardless of the upgrade. > > Thus make it more explicit. > > Fixes: 92c4a1e7e81c ("rust: init/sync: add `InPlaceInit` trait to pin-initialize smart pointers") > Link: https://github.com/rust-lang/rust/issues/106142 [1] > Signed-off-by: Miguel Ojeda ojeda@kernel.org Reviewed-by: Björn Roy Baron <bjorn3_gh@protonmail.com> > > --- > rust/kernel/sync/arc.rs | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/rust/kernel/sync/arc.rs b/rust/kernel/sync/arc.rs > index e6d206242465..1b0734fdf6a7 100644 > --- a/rust/kernel/sync/arc.rs > +++ b/rust/kernel/sync/arc.rs > @@ -185,7 +185,7 @@ impl<T> Arc<T> { > > /// Use the given initializer to in-place initialize a `T`. > /// > - /// This is equivalent to [`pin_init`], since an [`Arc`] is always pinned. > + /// This is equivalent to [`Arc<T>::pin_init`], since an [`Arc`] is always pinned. > #[inline] > pub fn init<E>(init: impl Init<T, E>) -> error::Result<Self> > where > -- > 2.40.0
diff --git a/rust/kernel/sync/arc.rs b/rust/kernel/sync/arc.rs index e6d206242465..1b0734fdf6a7 100644 --- a/rust/kernel/sync/arc.rs +++ b/rust/kernel/sync/arc.rs @@ -185,7 +185,7 @@ impl<T> Arc<T> { /// Use the given initializer to in-place initialize a `T`. /// - /// This is equivalent to [`pin_init`], since an [`Arc`] is always pinned. + /// This is equivalent to [`Arc<T>::pin_init`], since an [`Arc`] is always pinned. #[inline] pub fn init<E>(init: impl Init<T, E>) -> error::Result<Self> where