From patchwork Mon Apr 24 08:11:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benno Lossin X-Patchwork-Id: 86900 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2587727vqo; Mon, 24 Apr 2023 01:31:26 -0700 (PDT) X-Google-Smtp-Source: AKy350aoFfSN1EyN9KlNv5lVEgahw/hqRbdhDhj/Nc5DOhphOtgCLJkQneJuSkBtUbu3pj6s07A2 X-Received: by 2002:a17:903:890:b0:1a1:b3bb:cd5b with SMTP id kt16-20020a170903089000b001a1b3bbcd5bmr11475049plb.62.1682325086055; Mon, 24 Apr 2023 01:31:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682325086; cv=none; d=google.com; s=arc-20160816; b=mrDUiRzpjh1lEtpG70vuHm/c+8o/fvG8lgemIxB8lDt9mOYFCFVCziPPB2YSJmcS58 9uDeJ4BlZok+EK1Chzy8RVsW8dTMkx14BKrjh3NmsepLwKm6GTeuFP8jjBd/yE8D4jXS V0k44Ju8uSHfvBB5NqV8qjoX4sqlHmYum7fCYFirv293zOYPWCk0J7TXdQjrc7/6K46T xwYoJIpG0DSbs2oq5LWBm9yGljKNBAOpvMUZcxLFO9wI/9zJ13o4QuGMjyhtdEExQ6XY rgGqoJoMVzVpg8WB8AJjCYW6/leTFvjvaPxAYFYB+lWFEYgX7tX0GqK3USdEh9XcZv/H B8Rg== 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:message-id:subject:cc:from:to:dkim-signature:date; bh=9tXLJw7aS2XfS2d3gc4JfQ1c+axPiaqoVKfXWCkw42E=; b=L6jaUCUKBfGOGQaoJlbso+fvmTRMUi9NhgROKHw8gR0OMUIVKazUaLCTjCcru1NuMA tmakOQplub/nW83kca5GpFn6LsptRbVAETOgN4IQ2OJfVBGTmiQxH61W39/62TRkSKcz UJxW3CJJZXmVFf/MGRzRoIur8iwH/OAG8oUVDX2QYYG+9LQhSP8SAnYi1WAX3fL8cmBJ qMmbZy3/gMvP9XRFoqPb/wclr2KMc5aY8IyME2AHCqfE3JNSljC72ChmaCe1r1TlY5RQ ph/Gi1sjSsaWjqiOa2mLE6MkUG1Z7oSk2kepvecgXh02GnSl1MyOTENtm04LP/hAZ2/E hXUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@proton.me header.s=protonmail header.b=bf4SNBhM; 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=proton.me Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id u9-20020a170903124900b001a979141a25si1950882plh.243.2023.04.24.01.31.08; Mon, 24 Apr 2023 01:31:26 -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=@proton.me header.s=protonmail header.b=bf4SNBhM; 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=proton.me Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231564AbjDXIL7 (ORCPT + 99 others); Mon, 24 Apr 2023 04:11:59 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49530 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231551AbjDXILs (ORCPT ); Mon, 24 Apr 2023 04:11:48 -0400 Received: from mail-0301.mail-europe.com (mail-0301.mail-europe.com [188.165.51.139]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 38FA910E7; Mon, 24 Apr 2023 01:11:47 -0700 (PDT) Date: Mon, 24 Apr 2023 08:11:33 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=proton.me; s=protonmail; t=1682323903; x=1682583103; bh=9tXLJw7aS2XfS2d3gc4JfQ1c+axPiaqoVKfXWCkw42E=; h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date: Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector; b=bf4SNBhMwTguIdAncVzh5qLxV1ZYWi5GolZ7vhl4PHQALjDS4AaYfZPVsJxi3p4Xy J9c0TDW7wOHdvqGNedNTQfjXceAGYPKLW05jU0wRyPNiFDDJW5uDo1eVsOUag1aqkj dzDynwvOS/V1XjvKh9Wvz/1PjZksRH24dtFWDY1KvqhbNtAisuGuzEmhYvZrqCA53v 59BuMDz2nIa3f41puY8UTwzFHvaMTBrIHbfP4W6q71ha+k477z6NSu9tcTXK3Uie0C h8JsTD9qERL7wpGzDU7nSSHk8//0sM7gDHTiWgE4CT+VN4lF6+yTEj158C8QFJO6J1 fu/YtqWt9PCBw== To: Miguel Ojeda , Alex Gaynor , Wedson Almeida Filho , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= From: Benno Lossin Cc: rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org, patches@lists.linux.dev, Benno Lossin Subject: [PATCH 1/4] rust: macros: fix usage of `#[allow]` in `quote!` Message-ID: <20230424081112.99890-1-benno.lossin@proton.me> Feedback-ID: 71780778:user:proton MIME-Version: 1.0 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE 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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1764045709586048138?= X-GMAIL-MSGID: =?utf-8?q?1764045709586048138?= When using `quote!` as part of an expression that was not the last one in a function, the `#[allow(clippy::vec_init_then_push)]` attribute would be present on an expression, which is not allowed. This patch refactors that part of the macro to use a statement instead. Signed-off-by: Benno Lossin Reviewed-by: Martin Rodriguez Reboredo Reviewed-by: Alice Ryhl Reviewed-by: Gary Guo --- rust/macros/quote.rs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) base-commit: ea76e08f4d901a450619831a255e9e0a4c0ed162 -- 2.40.0 diff --git a/rust/macros/quote.rs b/rust/macros/quote.rs index c8e08b3c1e4c..dddbb4e6f4cb 100644 --- a/rust/macros/quote.rs +++ b/rust/macros/quote.rs @@ -39,12 +39,14 @@ impl ToTokens for TokenStream { /// [`quote_spanned!`](https://docs.rs/quote/latest/quote/macro.quote_spanned.html) macro from the /// `quote` crate but provides only just enough functionality needed by the current `macros` crate. macro_rules! quote_spanned { - ($span:expr => $($tt:tt)*) => { - #[allow(clippy::vec_init_then_push)] - { - let mut tokens = ::std::vec::Vec::new(); - let span = $span; - quote_spanned!(@proc tokens span $($tt)*); + ($span:expr => $($tt:tt)*) => {{ + let mut tokens; + #[allow(clippy::vec_init_then_push)] + { + tokens = ::std::vec::Vec::new(); + let span = $span; + quote_spanned!(@proc tokens span $($tt)*); + } ::proc_macro::TokenStream::from_iter(tokens) }}; (@proc $v:ident $span:ident) => {};