From patchwork Thu Jun 19 15:06:25 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tamir Duberstein X-Patchwork-Id: 898976 Received: from mail-qt1-f178.google.com (mail-qt1-f178.google.com [209.85.160.178]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 65492235346; Thu, 19 Jun 2025 15:06:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750345596; cv=none; b=pUXJ0gtijTitY+ag3uRIPu5SJ4eMCH8ZR0Vpqz6cIpD/aA+DrM3+DTqUHjcCtEdh8W52mpjBVn3XBG8AlG5YXLH5D7a7kl5uBLhYmOoaNlpc4uYW98aQvJPmG3QhdODyuuCR+6bx2FuwsvLzrJHAnYpjQInFlGbEvqmQffhU69s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750345596; c=relaxed/simple; bh=EBOv2iJUrNuFvpf6DgfwXDAQle4Ii2A9b6MwmYUjoEA=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=l+D/UhOtV2NWqc1DV7gRHIVZ6y+MML01s8CdSqd+hkvZmROkB+TBkKMmwNa136LtHXYEd/Z3rhLkKsUProU/w124KpSlPeJBLJ2w/E0hi9gpoo1cKZvwWEhNPiZIMWmvvB4vrVTpRKm/GwcxpOHcy7v681HSB90x9N5az4TirCc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=SguMwELY; arc=none smtp.client-ip=209.85.160.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="SguMwELY" Received: by mail-qt1-f178.google.com with SMTP id d75a77b69052e-4a774209cf0so6327151cf.0; Thu, 19 Jun 2025 08:06:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750345593; x=1750950393; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=bM2aOZbws9YwwuYVjK1ug8LtX85CzdHif6CnDf/GxLg=; b=SguMwELYqOXzrouyRq+qewvN8D67tfxB3T8aJZcKqyP+BfQt2e84lMIJ7XVnm4dcHc 0MEpYFBc0hsgHaVoBvNxcVNJs36vaKg1q4gU+YuSV6dEQmKh+tbjD7nZVAvPUNLYMgfA OLEV7wvy2FlrggBQNBGk5D83i5F9Nlbp8B8neWP3phJRLVYb3FkvCeTfZ9EZyk+ZNFcb 4uBM2MK5bOcQ1F4c0OSZSpPM330KhWhmh9nj2a28fY0i153dTeW/P+v9U4iUS13S90TC U8plf1E56xcoKwyQg0BbQ2ftfOrcaVNkqqLk+bh0hHIHItqXfhdkVDgbJYzQSWe6XIOo Jc3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750345593; x=1750950393; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bM2aOZbws9YwwuYVjK1ug8LtX85CzdHif6CnDf/GxLg=; b=HlppUm5Cg92wQBHEnK8NRiRXEl/Ly9YMMYhCEtoZ65X1nav+p+enWJ6ebgq9/5lTEF ZGmJ2ppxfWKYGhB0zGiocSqmDHbZixOk2jqw5nh8BkmVYXr0Eu0AdpmRM3IeggMONkh7 rzOz18q97vKChVpwNmwQj+5Pj4jJhuor583rI7eH5IkKqnoxgVNCm/MAY+hXTJYmueH1 ViSDcHf3EBoyFShsNs3sZM34hhzvBcsluSwzDXr1496lKjoxl+1K43/Oq5xjlLmqJyCs gZdb0qYQDMuv/c8Oy6uyKWIL5krjRmj4ObhpjHKvjkMYyaxoHrRxf4w/QJaqG/huwvr4 8R3g== X-Forwarded-Encrypted: i=1; AJvYcCUNGTLQD+6pZoqYR7DayRbrDccX34/cHzc6wjt3TGbqlRcgTmCv5WzzuLN6MYyiCpS4Fnd6oWv5qmze@vger.kernel.org, AJvYcCUS7lGXHFMtDyj7PV6E3KXcd/7RwIHBTjrA2T+ujhBF/s16P3u20mWqKEnF5tCjiDSMP+5Y5qhuKnGh6qPZh4/7@vger.kernel.org, AJvYcCUbDzyRz0yMDrIz0mHlM6GLMelyAkFXBESXzJuVBVP+M8PuyUV4N4jQczvraV1sBIeudobqf1RJJYHr@vger.kernel.org, AJvYcCUdEgh+7Z+YJl/VyFntAmX5kLMzCxBr/h69canm8ougUn/7emuuyMOeM8PyNQLQ50y97GvRlIMpDTY=@vger.kernel.org, AJvYcCVAbFV94xqZHwS76UqB0kL4R5gLZ2Xw+ir/DRTVSo5DTfY5qzB6tuKuECK3/skxBXDebKN6ze4M2gsKLPA=@vger.kernel.org, AJvYcCWrtCN+lR+4SSLKMpvTYGxu7wVhP8OZfkRhMGSAVE1ZqODSO1A4svRQpEhHMjOI1EXdUvTlQgSP@vger.kernel.org, AJvYcCXFVADAyvF6F5QkUx9A/QUAH6tKUaonL7kDnaJlT0Fk0n5OwKSyBQ9KmBg1CQsA5sXjjve6TwPEm5TV@vger.kernel.org, AJvYcCXQNlh6m937hA6wIvSh6ejG78+DnTjSyGY36+HSf747ib+ksXfn04aYaaA+C86p823i8X9p83ELvMFNcn0F@vger.kernel.org X-Gm-Message-State: AOJu0Yw4E9e47CeWD8iw2Aw9SI06b4naOl4mqWygnbwgizNa1lWejy9z /es1ZvqV+HJ4vaJgFfK4EC/VOheFiNTMYiWlocB5GXMCJc7HPQlgEOSY X-Gm-Gg: ASbGnct7lwBmD0nPFl2kDh5MeTLJvE6RjbLUIfcDa0J7vv/ib991KBbTxC1XjA8rGO9 elLbl2DfiFe1VcBRb4qBnQhZWzQ80F/tGqtAYL13y/jG3bVdYwkJf6oywagMLWTN/lNlxTj9Q0g rdwC35oAtTc9cLabqLnDuLiGt5apOxGoauKCfwWPxbN+yj40zLFtrcL8Q73mG+oLhPwGu/9Ojlj PgwN66IOHSTKbJtt3HzWAkae96wiGTuijEuOeKCnm++r1UGBPtD+QXdsGGzLiRiYHJ1cCr41uR8 SclDqapjX5csmRWbXDw8CJVWLbBZdQHq2xEeGC7eo1XEZ//QZafdmpQtYGXsczFHsmyYOZ70Emc = X-Google-Smtp-Source: AGHT+IH6uoGJ80i+gmE2Fu3xsbwnovJZH3MPF8JNjcwJ3CVhnE00RGYIPfowX1mIbGAqF/jdU2etbQ== X-Received: by 2002:a05:622a:188c:b0:4a7:29f2:313 with SMTP id d75a77b69052e-4a73c619203mr287096761cf.42.1750345593031; Thu, 19 Jun 2025 08:06:33 -0700 (PDT) Received: from tamird-mac.local ([2600:4041:5be7:7c00:5c8a:fc6a:b57c:e57f]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-4a7785aaacdsm250531cf.39.2025.06.19.08.06.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Jun 2025 08:06:32 -0700 (PDT) From: Tamir Duberstein Date: Thu, 19 Jun 2025 11:06:25 -0400 Subject: [PATCH v12 1/5] rust: macros: reduce collections in `quote!` macro Precedence: bulk X-Mailing-List: linux-pm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250619-cstr-core-v12-1-80c9c7b45900@gmail.com> References: <20250619-cstr-core-v12-0-80c9c7b45900@gmail.com> In-Reply-To: <20250619-cstr-core-v12-0-80c9c7b45900@gmail.com> To: Michal Rostecki , Miguel Ojeda , Alex Gaynor , Boqun Feng , Gary Guo , =?utf-8?q?Bj=C3=B6rn_Roy_Baron?= , Andreas Hindborg , Alice Ryhl , Trevor Gross , Brendan Higgins , David Gow , Rae Moar , Danilo Krummrich , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Greg Kroah-Hartman , "Rafael J. Wysocki" , Luis Chamberlain , Russ Weight , FUJITA Tomonori , Rob Herring , Saravana Kannan , Peter Zijlstra , Ingo Molnar , Will Deacon , Waiman Long , Nathan Chancellor , Nick Desaulniers , Bill Wendling , Justin Stitt , Andrew Lunn , Heiner Kallweit , Russell King , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Bjorn Helgaas , Arnd Bergmann , Jens Axboe , Benno Lossin , =?utf-8?q?Krzysztof_Wilczy=C5=84ski?= , Dave Ertman , Ira Weiny , Leon Romanovsky , Breno Leitao , Viresh Kumar , Michael Turquette , Stephen Boyd Cc: rust-for-linux@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, kunit-dev@googlegroups.com, dri-devel@lists.freedesktop.org, netdev@vger.kernel.org, devicetree@vger.kernel.org, llvm@lists.linux.dev, linux-pci@vger.kernel.org, nouveau@lists.freedesktop.org, linux-block@vger.kernel.org, linux-pm@vger.kernel.org, linux-clk@vger.kernel.org, Tamir Duberstein X-Mailer: b4 0.15-dev Remove a handful of unncessary intermediate vectors and token streams; mainly the top-level stream can be directly extended with the notable exception of groups. Remove an unnecessary `#[allow(dead_code)]` added in commit dbd5058ba60c ("rust: make pin-init its own crate"). Signed-off-by: Tamir Duberstein --- rust/macros/quote.rs | 104 ++++++++++++++++++++++++--------------------------- 1 file changed, 49 insertions(+), 55 deletions(-) diff --git a/rust/macros/quote.rs b/rust/macros/quote.rs index 92cacc4067c9..acc140c18653 100644 --- a/rust/macros/quote.rs +++ b/rust/macros/quote.rs @@ -2,7 +2,6 @@ use proc_macro::{TokenStream, TokenTree}; -#[allow(dead_code)] pub(crate) trait ToTokens { fn to_tokens(&self, tokens: &mut TokenStream); } @@ -47,121 +46,116 @@ fn to_tokens(&self, tokens: &mut TokenStream) { /// `quote` crate but provides only just enough functionality needed by the current `macros` crate. macro_rules! quote_spanned { ($span:expr => $($tt:tt)*) => {{ - let mut tokens: ::std::vec::Vec<::proc_macro::TokenTree>; - #[allow(clippy::vec_init_then_push)] + let mut tokens = ::proc_macro::TokenStream::new(); { - tokens = ::std::vec::Vec::new(); let span = $span; quote_spanned!(@proc tokens span $($tt)*); } - ::proc_macro::TokenStream::from_iter(tokens) + tokens }}; (@proc $v:ident $span:ident) => {}; (@proc $v:ident $span:ident #$id:ident $($tt:tt)*) => { - let mut ts = ::proc_macro::TokenStream::new(); - $crate::quote::ToTokens::to_tokens(&$id, &mut ts); - $v.extend(ts); + $crate::quote::ToTokens::to_tokens(&$id, &mut $v); quote_spanned!(@proc $v $span $($tt)*); }; (@proc $v:ident $span:ident #(#$id:ident)* $($tt:tt)*) => { for token in $id { - let mut ts = ::proc_macro::TokenStream::new(); - $crate::quote::ToTokens::to_tokens(&token, &mut ts); - $v.extend(ts); + $crate::quote::ToTokens::to_tokens(&token, &mut $v); } quote_spanned!(@proc $v $span $($tt)*); }; (@proc $v:ident $span:ident ( $($inner:tt)* ) $($tt:tt)*) => { #[allow(unused_mut)] - let mut tokens = ::std::vec::Vec::<::proc_macro::TokenTree>::new(); + let mut tokens = ::proc_macro::TokenStream::new(); quote_spanned!(@proc tokens $span $($inner)*); - $v.push(::proc_macro::TokenTree::Group(::proc_macro::Group::new( + $v.extend([::proc_macro::TokenTree::Group(::proc_macro::Group::new( ::proc_macro::Delimiter::Parenthesis, - ::proc_macro::TokenStream::from_iter(tokens) - ))); + tokens, + ))]); quote_spanned!(@proc $v $span $($tt)*); }; (@proc $v:ident $span:ident [ $($inner:tt)* ] $($tt:tt)*) => { - let mut tokens = ::std::vec::Vec::new(); + let mut tokens = ::proc_macro::TokenStream::new(); quote_spanned!(@proc tokens $span $($inner)*); - $v.push(::proc_macro::TokenTree::Group(::proc_macro::Group::new( + $v.extend([::proc_macro::TokenTree::Group(::proc_macro::Group::new( ::proc_macro::Delimiter::Bracket, - ::proc_macro::TokenStream::from_iter(tokens) - ))); + tokens, + ))]); quote_spanned!(@proc $v $span $($tt)*); }; (@proc $v:ident $span:ident { $($inner:tt)* } $($tt:tt)*) => { - let mut tokens = ::std::vec::Vec::new(); + let mut tokens = ::proc_macro::TokenStream::new(); quote_spanned!(@proc tokens $span $($inner)*); - $v.push(::proc_macro::TokenTree::Group(::proc_macro::Group::new( + $v.extend([::proc_macro::TokenTree::Group(::proc_macro::Group::new( ::proc_macro::Delimiter::Brace, - ::proc_macro::TokenStream::from_iter(tokens) - ))); + tokens, + ))]); quote_spanned!(@proc $v $span $($tt)*); }; (@proc $v:ident $span:ident :: $($tt:tt)*) => { - $v.push(::proc_macro::TokenTree::Punct( - ::proc_macro::Punct::new(':', ::proc_macro::Spacing::Joint) - )); - $v.push(::proc_macro::TokenTree::Punct( - ::proc_macro::Punct::new(':', ::proc_macro::Spacing::Alone) - )); + $v.extend([::proc_macro::Spacing::Joint, ::proc_macro::Spacing::Alone].map(|spacing| { + ::proc_macro::TokenTree::Punct(::proc_macro::Punct::new(':', spacing)) + })); quote_spanned!(@proc $v $span $($tt)*); }; (@proc $v:ident $span:ident : $($tt:tt)*) => { - $v.push(::proc_macro::TokenTree::Punct( - ::proc_macro::Punct::new(':', ::proc_macro::Spacing::Alone) - )); + $v.extend([::proc_macro::TokenTree::Punct( + ::proc_macro::Punct::new(':', ::proc_macro::Spacing::Alone), + )]); quote_spanned!(@proc $v $span $($tt)*); }; (@proc $v:ident $span:ident , $($tt:tt)*) => { - $v.push(::proc_macro::TokenTree::Punct( - ::proc_macro::Punct::new(',', ::proc_macro::Spacing::Alone) - )); + $v.extend([::proc_macro::TokenTree::Punct( + ::proc_macro::Punct::new(',', ::proc_macro::Spacing::Alone), + )]); quote_spanned!(@proc $v $span $($tt)*); }; (@proc $v:ident $span:ident @ $($tt:tt)*) => { - $v.push(::proc_macro::TokenTree::Punct( - ::proc_macro::Punct::new('@', ::proc_macro::Spacing::Alone) - )); + $v.extend([::proc_macro::TokenTree::Punct( + ::proc_macro::Punct::new('@', ::proc_macro::Spacing::Alone), + )]); quote_spanned!(@proc $v $span $($tt)*); }; (@proc $v:ident $span:ident ! $($tt:tt)*) => { - $v.push(::proc_macro::TokenTree::Punct( - ::proc_macro::Punct::new('!', ::proc_macro::Spacing::Alone) - )); + $v.extend([::proc_macro::TokenTree::Punct( + ::proc_macro::Punct::new('!', ::proc_macro::Spacing::Alone), + )]); quote_spanned!(@proc $v $span $($tt)*); }; (@proc $v:ident $span:ident ; $($tt:tt)*) => { - $v.push(::proc_macro::TokenTree::Punct( - ::proc_macro::Punct::new(';', ::proc_macro::Spacing::Alone) - )); + $v.extend([::proc_macro::TokenTree::Punct( + ::proc_macro::Punct::new(';', ::proc_macro::Spacing::Alone), + )]); quote_spanned!(@proc $v $span $($tt)*); }; (@proc $v:ident $span:ident + $($tt:tt)*) => { - $v.push(::proc_macro::TokenTree::Punct( - ::proc_macro::Punct::new('+', ::proc_macro::Spacing::Alone) - )); + $v.extend([::proc_macro::TokenTree::Punct( + ::proc_macro::Punct::new('+', ::proc_macro::Spacing::Alone), + )]); quote_spanned!(@proc $v $span $($tt)*); }; (@proc $v:ident $span:ident = $($tt:tt)*) => { - $v.push(::proc_macro::TokenTree::Punct( - ::proc_macro::Punct::new('=', ::proc_macro::Spacing::Alone) - )); + $v.extend([::proc_macro::TokenTree::Punct( + ::proc_macro::Punct::new('=', ::proc_macro::Spacing::Alone), + )]); quote_spanned!(@proc $v $span $($tt)*); }; (@proc $v:ident $span:ident # $($tt:tt)*) => { - $v.push(::proc_macro::TokenTree::Punct( - ::proc_macro::Punct::new('#', ::proc_macro::Spacing::Alone) - )); + $v.extend([::proc_macro::TokenTree::Punct( + ::proc_macro::Punct::new('#', ::proc_macro::Spacing::Alone), + )]); quote_spanned!(@proc $v $span $($tt)*); }; (@proc $v:ident $span:ident _ $($tt:tt)*) => { - $v.push(::proc_macro::TokenTree::Ident(::proc_macro::Ident::new("_", $span))); + $v.extend([::proc_macro::TokenTree::Ident( + ::proc_macro::Ident::new("_", $span), + )]); quote_spanned!(@proc $v $span $($tt)*); }; (@proc $v:ident $span:ident $id:ident $($tt:tt)*) => { - $v.push(::proc_macro::TokenTree::Ident(::proc_macro::Ident::new(stringify!($id), $span))); + $v.extend([::proc_macro::TokenTree::Ident( + ::proc_macro::Ident::new(stringify!($id), $span), + )]); quote_spanned!(@proc $v $span $($tt)*); }; }