From nobody Sat Nov 15 09:31:55 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1752734731; cv=none; d=zohomail.com; s=zohoarc; b=KimkBZGfvm0hIgz4ilsfyI43GdPp+cMUXWLLyVYRoj+b7LM50gzXCFkEBwBYXhip7e1DdVFZ4IMntV0Mq257fsFlBohu7YygvjI7vBhFci0Jz2tHMUHLvAdpdP6LmsfzsyfAV4PzWLCQLdTXTROHxFkkcjJubPhxqRznC25BTNc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752734731; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=idkGHwv6pmeTAhqgTjVqPwn8pB104XDgL5/WOwov3Dw=; b=OFuQtbU/cMt4J+evaEeJR08JpwsNjRs1TpRHQ9DMBZgGFBRj69+NjianI1fX2yKvanp9Uj2COLN2eXq0C5mTeGKFqa7Dahb/YMQdyfvosc6WBFOCL3RqVmhBK1h01o86zVWxSWpR8ajTSeezOa7BBGzSXd2EY0xGtTHr6qICCg8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1752734731747245.52826391508165; Wed, 16 Jul 2025 23:45:31 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ucIMd-0006z0-KG; Thu, 17 Jul 2025 02:45:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ucI5l-0008Af-EJ for qemu-devel@nongnu.org; Thu, 17 Jul 2025 02:27:43 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ucI5h-000865-JQ for qemu-devel@nongnu.org; Thu, 17 Jul 2025 02:27:39 -0400 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-609-Gr2DzOPYPJuRERGWtBY-5Q-1; Thu, 17 Jul 2025 02:27:35 -0400 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-45359bfe631so2520295e9.0 for ; Wed, 16 Jul 2025 23:27:34 -0700 (PDT) Received: from [192.168.10.48] ([151.49.73.155]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b5e8e1e1d5sm19941359f8f.78.2025.07.16.23.27.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jul 2025 23:27:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752733656; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=idkGHwv6pmeTAhqgTjVqPwn8pB104XDgL5/WOwov3Dw=; b=DlFXCCChL9iDPwkSexJtvFLm2xSpXA6LciIw17alvf7MkBT9WJqvCLNx/04zOs5iYMhjXL LDviQY3oqQf39i8On8LyOPyYCkkwx2XXhcRXevVZUs2et6f+YMKNZTlbNdpb62zma0A7MZ cDwfenHgDIrdni6ejugjkpnc8Ywk7tg= X-MC-Unique: Gr2DzOPYPJuRERGWtBY-5Q-1 X-Mimecast-MFC-AGG-ID: Gr2DzOPYPJuRERGWtBY-5Q_1752733654 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752733653; x=1753338453; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=idkGHwv6pmeTAhqgTjVqPwn8pB104XDgL5/WOwov3Dw=; b=ZKN6KV6eoYP2CP1i4ifcmUSQ5E9HFef0aJ9vv4N9rpy4tz6l1c5+stzZbqsN3EL9gW jGLnh17c7V3rlwA+OFIIPqfe+CvgUn0i4Qd9+Edk77Rhhqlb1HHzw5fxXJxtkjweBl0t uRt9Of1vTyF0ESctbhHWLK8IwCtWl5gkt9KozNd3ChaqyH18NX+W14bWfK0mM0/uSAea gtI+Up+Fof31gmN311nU/BzoLApP2uu74+A/ICb4SF8SZ3jwpjA9kXcj/G3e+AHDhx8E XmlGdVv0KnLOqcmdMy02h0uynbEeZpAQOLfwDe+0xyLQAZhdzK+0W6TMrek8ed2zV6De Zx3w== X-Gm-Message-State: AOJu0Yxdp01U86Tp16ajCh1DTi50pQR1c5JcFcXvxXLHypzv5RJi4dA5 pv+cWjoGq9FPhChaBJav4Rz5LBia3cZLrUvO+4FsmsRepOXdfhFiqR3P1dD++8ABO1UCJecfQNC yKM0rXKxf7VFRZgB0OBzggVaHMZ2+lp4NzuLn/aYAeTlO6LAGZojP8NxN7jZUCEbvdgKYt0mgQF 0k86oU1oGVToxFYVQZpmRA4ZiQSDYXBYCKY3GBvfdC X-Gm-Gg: ASbGncsBQpRMNCvwDZRPItIcalqzkn8itNsEmMRfkXmVSOwRMlVxnlbcStPi+VvGUdE d9U6JJIZwLp/aJQvcmFqumVSGz5iiMm/qGrGVENTYj8ZmGeKw1INubctMYqWvt0VRzc9Hq3Ukse MtddnqYrOS+H7bgXppKzTDliKKAiZViDvtkxaOacznab2/wwYPSN7lty41k4bJTSswukzfN0ngZ EblCCYvCsDaZl8MdOO0XE7cHz5dBKVLTXaPtRAvKVqgfsxdeFyYPKyfmIZ+8Uw8kQUaSPp3g+Ht BFtu5VuqXCMu0slZoQ0e+cVWMdmuyC2mvDpGxX5pZp0= X-Received: by 2002:a05:6000:250d:b0:3a5:58a5:6a83 with SMTP id ffacd0b85a97d-3b613e66eaemr1140201f8f.13.1752733653268; Wed, 16 Jul 2025 23:27:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHra9UfOABKEB5T130dQ6ZZFVGZu4mHDHo1L6t3BM9ReMpJah12MQbrITyMyROflUJgshaO2A== X-Received: by 2002:a05:6000:250d:b0:3a5:58a5:6a83 with SMTP id ffacd0b85a97d-3b613e66eaemr1140179f8f.13.1752733652817; Wed, 16 Jul 2025 23:27:32 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: qemu-rust@nongnu.org, manos.pitsidianakis@linaro.org Subject: [PATCH 1/4] subprojects: update proc-macro2 and syn Date: Thu, 17 Jul 2025 08:27:24 +0200 Message-ID: <20250717062727.305466-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250717062727.305466-1-pbonzini@redhat.com> References: <20250717062727.305466-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1752734734667116600 Content-Type: text/plain; charset="utf-8" Update to a version that is accepted by the attrs crate. Signed-off-by: Paolo Bonzini --- rust/Cargo.lock | 8 ++++---- subprojects/.gitignore | 4 ++-- subprojects/packagefiles/proc-macro2-1-rs/meson.build | 2 +- subprojects/packagefiles/syn-2-rs/meson.build | 2 +- subprojects/proc-macro2-1-rs.wrap | 8 ++++---- subprojects/syn-2-rs.wrap | 8 ++++---- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/rust/Cargo.lock b/rust/Cargo.lock index b785c718f31..4baf6ba663c 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -118,9 +118,9 @@ dependencies =3D [ =20 [[package]] name =3D "proc-macro2" -version =3D "1.0.84" +version =3D "1.0.95" source =3D "registry+https://github.com/rust-lang/crates.io-index" -checksum =3D "ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc12024a= 49d6" +checksum =3D "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7= f778" dependencies =3D [ "unicode-ident", ] @@ -155,9 +155,9 @@ dependencies =3D [ =20 [[package]] name =3D "syn" -version =3D "2.0.66" +version =3D "2.0.104" source =3D "registry+https://github.com/rust-lang/crates.io-index" -checksum =3D "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cd= cff5" +checksum =3D "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b43= 5a40" dependencies =3D [ "proc-macro2", "quote", diff --git a/subprojects/.gitignore b/subprojects/.gitignore index f4281934ce1..9d579f72d12 100644 --- a/subprojects/.gitignore +++ b/subprojects/.gitignore @@ -16,7 +16,7 @@ /libc-0.2.162 /proc-macro-error-1.0.4 /proc-macro-error-attr-1.0.4 -/proc-macro2-1.0.84 +/proc-macro2-1.0.95 /quote-1.0.36 -/syn-2.0.66 +/syn-2.0.104 /unicode-ident-1.0.12 diff --git a/subprojects/packagefiles/proc-macro2-1-rs/meson.build b/subpro= jects/packagefiles/proc-macro2-1-rs/meson.build index 5759df3ecc9..ba7de070292 100644 --- a/subprojects/packagefiles/proc-macro2-1-rs/meson.build +++ b/subprojects/packagefiles/proc-macro2-1-rs/meson.build @@ -1,6 +1,6 @@ project('proc-macro2-1-rs', 'rust', meson_version: '>=3D1.5.0', - version: '1.0.84', + version: '1.0.95', license: 'MIT OR Apache-2.0', default_options: []) =20 diff --git a/subprojects/packagefiles/syn-2-rs/meson.build b/subprojects/pa= ckagefiles/syn-2-rs/meson.build index a0094174084..3e6dc318a9c 100644 --- a/subprojects/packagefiles/syn-2-rs/meson.build +++ b/subprojects/packagefiles/syn-2-rs/meson.build @@ -1,6 +1,6 @@ project('syn-2-rs', 'rust', meson_version: '>=3D1.5.0', - version: '2.0.66', + version: '2.0.104', license: 'MIT OR Apache-2.0', default_options: []) =20 diff --git a/subprojects/proc-macro2-1-rs.wrap b/subprojects/proc-macro2-1-= rs.wrap index 6c9369f0df3..0f06cd8e111 100644 --- a/subprojects/proc-macro2-1-rs.wrap +++ b/subprojects/proc-macro2-1-rs.wrap @@ -1,8 +1,8 @@ [wrap-file] -directory =3D proc-macro2-1.0.84 -source_url =3D https://crates.io/api/v1/crates/proc-macro2/1.0.84/download -source_filename =3D proc-macro2-1.0.84.0.tar.gz -source_hash =3D ec96c6a92621310b51366f1e28d05ef11489516e93be030060e5fc1202= 4a49d6 +directory =3D proc-macro2-1.0.95 +source_url =3D https://crates.io/api/v1/crates/proc-macro2/1.0.95/download +source_filename =3D proc-macro2-1.0.95.0.tar.gz +source_hash =3D 02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76= e7f778 #method =3D cargo patch_directory =3D proc-macro2-1-rs =20 diff --git a/subprojects/syn-2-rs.wrap b/subprojects/syn-2-rs.wrap index d79cf750fb4..1e5e9d9fb6e 100644 --- a/subprojects/syn-2-rs.wrap +++ b/subprojects/syn-2-rs.wrap @@ -1,8 +1,8 @@ [wrap-file] -directory =3D syn-2.0.66 -source_url =3D https://crates.io/api/v1/crates/syn/2.0.66/download -source_filename =3D syn-2.0.66.0.tar.gz -source_hash =3D c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3= cdcff5 +directory =3D syn-2.0.104 +source_url =3D https://crates.io/api/v1/crates/syn/2.0.104/download +source_filename =3D syn-2.0.104.0.tar.gz +source_hash =3D 17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b= 435a40 #method =3D cargo patch_directory =3D syn-2-rs =20 --=20 2.50.1 From nobody Sat Nov 15 09:31:55 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1752734797; cv=none; d=zohomail.com; s=zohoarc; b=k4+VKLohLfGTpESLztAs3U5+DTmevWXIOrlLIPVhcwLL/VeQ8K9200OBxd/089AQvZaQx/ZwHugefSEtygVnZwXi+NasqH1rxl9oxn7P1XrSCWHcZARzn8ypEB1fAn8bThOVjqu/pfp08x63S35tkDFLb9M/SminO/gXwLEhEis= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752734797; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=3wc7lAth6GBcBb8U8NN32axGheQwcFepJVyyKJ1eOa8=; b=erkVyowhpHLYB2Fi0e2aI/HrrxQf00wSuwBzZJqcxujEU3vm+WxB4kHk+Ib1v1nNAd9iJv4TjJntE4wlsR8j3mrGX0yjkGez5ELJ5SpNMV6GLNNIuXJPYdfQN0k4HVPIQslizHkRWIseqlyZkgLRU2DFQgB7XWLQrhwU2Z6bky4= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1752734797528399.9403538764906; Wed, 16 Jul 2025 23:46:37 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ucIN4-0007ca-W9; Thu, 17 Jul 2025 02:45:35 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ucI5p-0008EY-7U for qemu-devel@nongnu.org; Thu, 17 Jul 2025 02:27:46 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ucI5l-00086Q-IO for qemu-devel@nongnu.org; Thu, 17 Jul 2025 02:27:44 -0400 Received: from mail-wr1-f69.google.com (mail-wr1-f69.google.com [209.85.221.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-343-9xtXL2KaMn2Ub1NCN4gI-w-1; Thu, 17 Jul 2025 02:27:37 -0400 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-3a4eb6fcd88so321615f8f.1 for ; Wed, 16 Jul 2025 23:27:37 -0700 (PDT) Received: from [192.168.10.48] ([151.49.73.155]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3b5e8dc22a8sm20228574f8f.34.2025.07.16.23.27.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jul 2025 23:27:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752733659; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3wc7lAth6GBcBb8U8NN32axGheQwcFepJVyyKJ1eOa8=; b=bEDyCB0zpiOyIqFfMOyie/lJv3GSZE/usn8ANPmmyzMTR+8ik0juV89gdIPJniioOMZ5XE fUfYDyN4cNg9EcEplkLWoT8myzDBBjw7LZlZsa5qHB9A9676K8el4D0Y91in6a8TAeCbhj OYTLR3NK2prba21zMcKQ3kgCY29ZPJ4= X-MC-Unique: 9xtXL2KaMn2Ub1NCN4gI-w-1 X-Mimecast-MFC-AGG-ID: 9xtXL2KaMn2Ub1NCN4gI-w_1752733657 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752733656; x=1753338456; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3wc7lAth6GBcBb8U8NN32axGheQwcFepJVyyKJ1eOa8=; b=SpmABGMZ90PymShJLYS3t7IHOOqGR9QgonHGAoE34SDlxYvfVxzk8CNaPC4/c9ndzq TkzAd7LLIbp6S3YWFc2pnXlmECGEtusWLRajXTcQuxibeKUYibeXajG/rxHTdN2WA6KF TWRJV5LNcf9Y0hp+6J/R4ALjNPAN94YemOa/8ZoJt090JKnmzLkTK8HK1Lc0J3h1AfTM NvYYDqlIWDa4IIFwUZBps+7uMIeWxrMig2CRv2VasanBIqOVFygZxUqKmJ0a++feAeay pDskMLFi3yo7vwIUxGNqojleqXitb4pkmR3LsDPlk67sbp3oaHCPj1DoRILsC7q0wFZg gFKw== X-Gm-Message-State: AOJu0YxxlFaItyhpClocc3g71sED7hHXmxUlHtS1reC4k4M7cnBbn9dv 4c7vLGmqbv4Z9WI0BScP/roP7Sat/MFp9fziEIEDjTjm3ali6i1bYDJpQsmS7vMLpUIaozpPD/e cp+meVOb+qk1JYIA4xRo8XbvXaV1GVRehvJ+aSEVIWfCWComuFHR9f3R9PAaA7EHFxc9myGbGd/ HS/rtiIdP4maf12/qQGJ0PpkKVoe6prwDYoneV58gw X-Gm-Gg: ASbGncsQZ8f1rWALMhSKnfU28KiV22+HBA5PFOeILw3vUSHOTBMs5TfR7lywxMgbspj 0/VvA1PKG2Uk3/skuvSVBbqxP+FZ1d+j+hBkLOmd8+B1dMJmn43chzfgHMYtAaFo6eJUaHh40EI IjK0lrFiD8zCqBffrCjvgwK0boqBubwWIH6Ewxt6hk940jjALRkLV9K5nX+tFwoubNhzFGtiVyo BZyPAju+353p9FmtxhFu4WfiNpyCdqXP19oe1yeMcjrUdy8dg3Fuzti1II3RL5az5l5LRG+lNWt NWszdCUvGVHe4Gyh7BZnUN2JoMd314f0NKHon6OhoVE= X-Received: by 2002:a05:6000:4383:b0:3a5:27ba:479c with SMTP id ffacd0b85a97d-3b60e50ff53mr3983682f8f.43.1752733655665; Wed, 16 Jul 2025 23:27:35 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHr0SsmYWr/PIqoKlmDZAkgwq8lCzeqWOpKUZECwhrIPsT/AS+6vxAEdbTsYkEDvNnTcVdSXA== X-Received: by 2002:a05:6000:4383:b0:3a5:27ba:479c with SMTP id ffacd0b85a97d-3b60e50ff53mr3983652f8f.43.1752733655076; Wed, 16 Jul 2025 23:27:35 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: qemu-rust@nongnu.org, manos.pitsidianakis@linaro.org Subject: [PATCH 2/4] subprojects: add attrs crate Date: Thu, 17 Jul 2025 08:27:25 +0200 Message-ID: <20250717062727.305466-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250717062727.305466-1-pbonzini@redhat.com> References: <20250717062727.305466-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1752734799194116600 Content-Type: text/plain; charset="utf-8" The attrs crate is a simple combinator-based parser for Rust attributes. It will be used instead of a handwritten parser. Signed-off-by: Paolo Bonzini --- rust/Cargo.lock | 11 +++++++ rust/meson.build | 2 ++ rust/qemu-api-macros/Cargo.toml | 1 + rust/qemu-api-macros/meson.build | 1 + scripts/archive-source.sh | 2 +- scripts/make-release | 2 +- subprojects/.gitignore | 1 + subprojects/attrs-0.2-rs.wrap | 7 ++++ .../packagefiles/attrs-0.2-rs/meson.build | 32 +++++++++++++++++++ 9 files changed, 57 insertions(+), 2 deletions(-) create mode 100644 subprojects/attrs-0.2-rs.wrap create mode 100644 subprojects/packagefiles/attrs-0.2-rs/meson.build diff --git a/rust/Cargo.lock b/rust/Cargo.lock index 4baf6ba663c..570ba5b82d3 100644 --- a/rust/Cargo.lock +++ b/rust/Cargo.lock @@ -14,6 +14,16 @@ version =3D "1.2.7" source =3D "registry+https://github.com/rust-lang/crates.io-index" checksum =3D "c84fc003e338a6f69fbd4f7fe9f92b535ff13e9af8997f3b14b6ddff8b1d= f46d" =20 +[[package]] +name =3D "attrs" +version =3D "0.2.9" +source =3D "registry+https://github.com/rust-lang/crates.io-index" +checksum =3D "2a207d40f43de65285f3de0509bb6cb16bc46098864fce957122bbacce32= 7e5f" +dependencies =3D [ + "proc-macro2", + "syn", +] + [[package]] name =3D "bilge" version =3D "0.2.0" @@ -139,6 +149,7 @@ dependencies =3D [ name =3D "qemu_api_macros" version =3D "0.1.0" dependencies =3D [ + "attrs", "proc-macro2", "quote", "syn", diff --git a/rust/meson.build b/rust/meson.build index 331f11b7e72..21df23c1f9e 100644 --- a/rust/meson.build +++ b/rust/meson.build @@ -13,10 +13,12 @@ libc_rs =3D dependency('libc-0.2-rs') subproject('proc-macro2-1-rs', required: true) subproject('quote-1-rs', required: true) subproject('syn-2-rs', required: true) +subproject('attrs-0.2-rs', required: true) =20 quote_rs_native =3D dependency('quote-1-rs', native: true) syn_rs_native =3D dependency('syn-2-rs', native: true) proc_macro2_rs_native =3D dependency('proc-macro2-1-rs', native: true) +attrs_rs_native =3D dependency('attrs-0.2-rs', native: true) =20 qemuutil_rs =3D qemuutil.partial_dependency(link_args: true, links: true) =20 diff --git a/rust/qemu-api-macros/Cargo.toml b/rust/qemu-api-macros/Cargo.t= oml index 0cd40c8e168..99f7a425fcc 100644 --- a/rust/qemu-api-macros/Cargo.toml +++ b/rust/qemu-api-macros/Cargo.toml @@ -16,6 +16,7 @@ rust-version.workspace =3D true proc-macro =3D true =20 [dependencies] +attrs =3D "0.2.9" proc-macro2 =3D "1" quote =3D "1" syn =3D { version =3D "2", features =3D ["extra-traits"] } diff --git a/rust/qemu-api-macros/meson.build b/rust/qemu-api-macros/meson.= build index 2152bcb99b3..12d02b20c20 100644 --- a/rust/qemu-api-macros/meson.build +++ b/rust/qemu-api-macros/meson.build @@ -8,6 +8,7 @@ _qemu_api_macros_rs =3D rust.proc_macro( '--cfg', 'feature=3D"proc-macro"', ], dependencies: [ + attrs_rs_native, proc_macro2_rs_native, quote_rs_native, syn_rs_native, diff --git a/scripts/archive-source.sh b/scripts/archive-source.sh index 035828c532e..476a996a70d 100755 --- a/scripts/archive-source.sh +++ b/scripts/archive-source.sh @@ -27,7 +27,7 @@ sub_file=3D"${sub_tdir}/submodule.tar" # in their checkout, because the build environment is completely # different to the host OS. subprojects=3D"keycodemapdb libvfio-user berkeley-softfloat-3 - berkeley-testfloat-3 anyhow-1-rs arbitrary-int-1-rs bilge-0.2-rs + berkeley-testfloat-3 anyhow-1-rs arbitrary-int-1-rs attrs-0.2-rs bilge-0= .2-rs bilge-impl-0.2-rs either-1-rs foreign-0.3-rs itertools-0.11-rs libc-0.2-rs proc-macro2-1-rs proc-macro-error-1-rs proc-macro-error-attr-1-rs quote-1-rs diff --git a/scripts/make-release b/scripts/make-release index 4509a9fabf5..00a91fb95f4 100755 --- a/scripts/make-release +++ b/scripts/make-release @@ -40,7 +40,7 @@ fi =20 # Only include wraps that are invoked with subproject() SUBPROJECTS=3D"libvfio-user keycodemapdb berkeley-softfloat-3 - berkeley-testfloat-3 anyhow-1-rs arbitrary-int-1-rs bilge-0.2-rs + berkeley-testfloat-3 anyhow-1-rs arbitrary-int-1-rs attrs-0.2-rs bilge-0= .2-rs bilge-impl-0.2-rs either-1-rs foreign-0.3-rs itertools-0.11-rs libc-0.2-rs proc-macro2-1-rs proc-macro-error-1-rs proc-macro-error-attr-1-rs quote-1-rs diff --git a/subprojects/.gitignore b/subprojects/.gitignore index 9d579f72d12..1ffd9513671 100644 --- a/subprojects/.gitignore +++ b/subprojects/.gitignore @@ -8,6 +8,7 @@ /slirp /anyhow-1.0.98 /arbitrary-int-1.2.7 +/attrs-0.2.9 /bilge-0.2.0 /bilge-impl-0.2.0 /either-1.12.0 diff --git a/subprojects/attrs-0.2-rs.wrap b/subprojects/attrs-0.2-rs.wrap new file mode 100644 index 00000000000..cd43c91d63e --- /dev/null +++ b/subprojects/attrs-0.2-rs.wrap @@ -0,0 +1,7 @@ +[wrap-file] +directory =3D attrs-0.2.9 +source_url =3D https://crates.io/api/v1/crates/attrs/0.2.9/download +source_filename =3D attrs-0.2.9.tar.gz +source_hash =3D 2a207d40f43de65285f3de0509bb6cb16bc46098864fce957122bbacce= 327e5f +#method =3D cargo +patch_directory =3D attrs-0.2-rs diff --git a/subprojects/packagefiles/attrs-0.2-rs/meson.build b/subproject= s/packagefiles/attrs-0.2-rs/meson.build new file mode 100644 index 00000000000..fc6f269dcbf --- /dev/null +++ b/subprojects/packagefiles/attrs-0.2-rs/meson.build @@ -0,0 +1,32 @@ +project('attrs-0.2-rs', 'rust', + meson_version: '>=3D1.5.0', + version: '0.2.9', + license: 'MIT OR Apache-2.0', + default_options: []) + +subproject('attrs-0.2-rs', required: true) + +proc_macro2_dep =3D dependency('proc-macro2-1-rs', native: true) +syn_dep =3D dependency('syn-2-rs', native: true) + +_attrs_rs =3D static_library( + 'attrs', + files('src/lib.rs'), + gnu_symbol_visibility: 'hidden', + override_options: ['rust_std=3D2021', 'build.rust_std=3D2021'], + rust_abi: 'rust', + rust_args: [ + '--cap-lints', 'allow', + ], + dependencies: [ + proc_macro2_dep, + syn_dep, + ], + native: true, +) + +attrs_dep =3D declare_dependency( + link_with: _attrs_rs, +) + +meson.override_dependency('attrs-0.2-rs', attrs_dep, native: true) --=20 2.50.1 From nobody Sat Nov 15 09:31:55 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1752734831; cv=none; d=zohomail.com; s=zohoarc; b=ZFWDKCeDgewZJe8RxsqBfpMN6cqxtS81MtyN9/N9ziuJrudwqHxS3pXc6uB9FfBo11wFr9ppLs+ST2fRrpbCf2cZdj9ccd/Z+9UJRqvLIe9KncBOvYNmv1bqIMIZH15kqdJbUnkUyg74tpDy0rTAg/WPP0ei9V29gmhT8Pb5jBw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752734831; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=/noCMugMiqjebseDSiV8dQIXAh3/h5Bn5iEmWvEu9kY=; b=L12yaxrLG4M5W50pCaFtEasVEGl2hsBkqa0bMqPIP4cXQDVND/y/eCRLBnSD0W2kCtG+oS7Lqhw8AZFF8NCSBfvjlEhiMiP32oZD+2a5tZ+vPh+dsisGq4IdkHNtbX8wBv8iCF3GM+NW5jLFjuB60sm08HtIBf+iNk3x4K/o2Hs= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1752734831798472.30960927933415; Wed, 16 Jul 2025 23:47:11 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ucIOS-000152-Ne; Thu, 17 Jul 2025 02:47:01 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ucI5t-0008KH-21 for qemu-devel@nongnu.org; Thu, 17 Jul 2025 02:27:50 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ucI5n-00086r-0g for qemu-devel@nongnu.org; Thu, 17 Jul 2025 02:27:47 -0400 Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-512-pAHablfsNzCCcsljmHGJJw-1; Thu, 17 Jul 2025 02:27:40 -0400 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-453817323afso3149835e9.1 for ; Wed, 16 Jul 2025 23:27:39 -0700 (PDT) Received: from [192.168.10.48] ([151.49.73.155]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4562e886286sm41382885e9.26.2025.07.16.23.27.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jul 2025 23:27:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752733661; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/noCMugMiqjebseDSiV8dQIXAh3/h5Bn5iEmWvEu9kY=; b=c6jH4LoPmypiJMt9nJtMwGQTLCli49Dq421Mb0R+Jmrj3F7yeXEFg++Sk7H0wPdtQ6Gztc gV3Cexs76yxlmYF3JuDsuav4ywtTFHkJ2ndS36M3BRxoOzfeX28sP+gBWtkuLMsi1E4QfD JEJus/xQ0Dd3YqQIFNNi+uoEWyU9QQo= X-MC-Unique: pAHablfsNzCCcsljmHGJJw-1 X-Mimecast-MFC-AGG-ID: pAHablfsNzCCcsljmHGJJw_1752733659 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752733658; x=1753338458; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/noCMugMiqjebseDSiV8dQIXAh3/h5Bn5iEmWvEu9kY=; b=lVldVQ+/g2DoO7F7SDlKqsXFnQQbvecAgG/+GVZ2jOR9eAevlul8FjmYHRvwpGW6Qo li6ybGIeOVBDr8Ng07DrtGJ1HLu55rK6bL+Jb0oG3dyaOMJ0T85Z41soF0UaW7Soi604 Yl/ibEM9lhC5CdlwWik9CVGTPm5NHxnu9JtiWbKfEYGW0mwOmfSc2j5xGzPF2R1aTJvH 3zn/CoJhPQgsADhvZ8if09scIuVqxkwJ3uT/Q+vfgz6aIZUjIkdTSFhHXkD6MCGQMDkW CNakEYCEiYccKs6vJITD/T7uD+x+ftEpkNT8XNEghMkLqbomWnFugf5d9gfNQBpSGlsq bJYg== X-Gm-Message-State: AOJu0Yw4kLuN9Xxhe0lyPZo3QIriNXUvnl83agfw2BmWOjuycRZVBqYK q5waIGKID6dTop+aSHE8yvOUCJYzbTc+wwUauIWakJDgMF6YkhhcSR9r3x31M1M+49d/+8YGSee I0f2SWrSre/0SvucmOinuaFqbfBPPpvOdgt47arTiPpcjKPT1JVbHqQ4u4Obwlzkgwbo4bTScmg BXvAbDe8QnU36KiUvnULnDVYtAIuqOtAmWespIwTmR X-Gm-Gg: ASbGncs7VHq4FAan+kQ12NTPUMgIVf77emFt4YNR1fL9KAPhX8UWQEVUvgIe09IP8oY pM9rO1aJYUhpcmw1JajPSp61dN014tSi+V6INVa5JSGNy5RgE/u19S6o6/uiAt6FgnzotHyvQB7 3wZuG/0H7L8zEL5Eyey3ktrbhB0i2b6fLA6hy1d/ecgqaVamtXNMAEK1MrDo45o/AhOO+191YAY 1EjYh6zYKTw1sHG4ReZgxUZx25RXeMsSMxCZz438G7ccIbxXYLejHT0bp36MWx1fXMGDtZ+LXji bKKaxeSGCc0NnEQP4jjv+xhvpyr3PfUHrbVBYtTQD10= X-Received: by 2002:a05:600c:3555:b0:456:22f0:d9ca with SMTP id 5b1f17b1804b1-4562e28615dmr44305815e9.26.1752733657967; Wed, 16 Jul 2025 23:27:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGAzrPcCAwG842sVfUtiTgVZKBOLgrRSXmFxcohfHC+tdwmLrhUfVjT74lGKlPmmFlc6Q9yZA== X-Received: by 2002:a05:600c:3555:b0:456:22f0:d9ca with SMTP id 5b1f17b1804b1-4562e28615dmr44305565e9.26.1752733657468; Wed, 16 Jul 2025 23:27:37 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: qemu-rust@nongnu.org, manos.pitsidianakis@linaro.org Subject: [PATCH 3/4] rust: qemu-api-macros: support matching more than one error Date: Thu, 17 Jul 2025 08:27:26 +0200 Message-ID: <20250717062727.305466-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250717062727.305466-1-pbonzini@redhat.com> References: <20250717062727.305466-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1752734833401116600 Content-Type: text/plain; charset="utf-8" Signed-off-by: Paolo Bonzini --- rust/qemu-api-macros/src/tests.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rust/qemu-api-macros/src/tests.rs b/rust/qemu-api-macros/src/t= ests.rs index 4fbff97bffb..0e5a5728908 100644 --- a/rust/qemu-api-macros/src/tests.rs +++ b/rust/qemu-api-macros/src/tests.rs @@ -7,9 +7,9 @@ use super::*; =20 macro_rules! derive_compile_fail { - ($derive_fn:ident, $input:expr, $error_msg:expr) =3D> {{ + ($derive_fn:ident, $input:expr, $($error_msg:expr),+ $(,)?) =3D> {{ let input: proc_macro2::TokenStream =3D $input; - let error_msg: &str =3D $error_msg; + let error_msg =3D &[$( quote! { ::core::compile_error! { $error_ms= g } } ),*]; let derive_fn: fn(input: syn::DeriveInput) -> Result =3D $derive_fn; =20 @@ -18,7 +18,7 @@ macro_rules! derive_compile_fail { let err =3D result.unwrap_err().into_compile_error(); assert_eq!( err.to_string(), - quote! { ::core::compile_error! { #error_msg } }.to_string() + quote! { #(#error_msg)* }.to_string() ); }}; } --=20 2.50.1 From nobody Sat Nov 15 09:31:55 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=quarantine dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1752734924; cv=none; d=zohomail.com; s=zohoarc; b=A2WArhmrvsdxzTFUd2TitTRSjPXsEuPBo3TItGt/o/SpZTNQQYOGQNyfCCZInJpZoSO9mfYGYx5bZkmqVib/LIO/+kFXqhs6Cg1EmvppkUUd0qBPMY+At4Cf2iHvza0ZCumArh7rw11zCNig+dhboNmfrHxkcmNjYaXyFzbRQrA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1752734924; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=N4iEr+cNk1mlij6jwBXafMWcLDkNKM8oNL/AuVmjjjM=; b=IKiK6hjTOjQHMVnjrhWsZFtqcqaIOLwM2Df36G1TXtb7eCkq8K4yWnTxYrdxdHSe87U7u45kZJS81EeRyX8ewpynxPhrh46UOLTzJGgCcsFJ2FejYxWfapM5o8Gx51icV8bTUGMhKrxZfkt61u8b/FUuidojF23S/WmhcHksYoQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 175273492423738.00887114902582; Wed, 16 Jul 2025 23:48:44 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ucIOa-0001Vh-6K; Thu, 17 Jul 2025 02:47:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ucI5z-0008Ph-Kf for qemu-devel@nongnu.org; Thu, 17 Jul 2025 02:28:00 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ucI5w-00087r-Bi for qemu-devel@nongnu.org; Thu, 17 Jul 2025 02:27:54 -0400 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-155-CspR9uoKMzqSLShGsAk2Nw-1; Thu, 17 Jul 2025 02:27:43 -0400 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-456106b7c4aso7182965e9.0 for ; Wed, 16 Jul 2025 23:27:43 -0700 (PDT) Received: from [192.168.10.48] ([151.49.73.155]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4562e818525sm40539465e9.16.2025.07.16.23.27.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 16 Jul 2025 23:27:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1752733670; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=N4iEr+cNk1mlij6jwBXafMWcLDkNKM8oNL/AuVmjjjM=; b=XKXH8e2FDwxi0qxYxWis2pH/UbCpT13IrcvwJbyfqEgp8QDA25VWJBYI/yK4SusDrLf1Y3 /zm69IMuUokjf9de4KJGr5ypeU43B+Qcv1AtAVHcXa94BGQ85blXbOti/wPUIu3Xn88VH9 cWs3nbTOSrVFvddVWNLuNYlXzGjvtRM= X-MC-Unique: CspR9uoKMzqSLShGsAk2Nw-1 X-Mimecast-MFC-AGG-ID: CspR9uoKMzqSLShGsAk2Nw_1752733662 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1752733661; x=1753338461; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=N4iEr+cNk1mlij6jwBXafMWcLDkNKM8oNL/AuVmjjjM=; b=X0/o1qIr56rjsg1J53ra8cxrIUNuGBd+OKcvc3flVtyJ8T4iSlUpf4Du2ufnKTc4Lk W/y3AK5NC5Fwh8CeFFRdjfV79SsMkrglCi9LQRII7dwuqkwvdjBdbMSuQ+muwt8lcZGy xeSTBgHM+BTN2+gwOnPM1NmDPx9c1zT+B9MbeJF7ENxePguJLnuYJaHjdqEc4T1+wY8l ZYsig9Rp1Lw031C7XyuTKPUmbVd02CcHMEleYihXUmdvnkIYZ7bLMjKJgM2MvuHX3IWT ndeewxBDwNBAFc/KW5OHWGpzmpbxk9r65wrAceBL5grAknN7PIWy+vlkcF7XumPeJWkb 01bA== X-Gm-Message-State: AOJu0YyT9D8fRFnq7sXdfHDGK63qyGjeseVUSE26k9xjF+763Ci/tw89 11ahYfo8VY3eCm9HqwE+42MY1V9SKBRavbRURoVxV+bmJEybdD5onGdXhvd4FSpaCbZCM/ozIQu TQ9rWTvro2RqmuI/FzVRsKZPtBosvCBGBRFnJfz2AfOcRFuepiC0/3GlKN+tZP+KHTo0qE52g+o XYeTXXXOxk6op9x3WFh0cKFUp8xwyRVKDnOJDZEq5L X-Gm-Gg: ASbGnctDd0EY1+atF9tf5J1CxftziJslNv2NJS3I/9KZcpzgV2oTl71B7gMj6cZ8dfj 1OB0zyfG5aU8zqLUsU/XrcBs+WoCf03MUpu1HoE6HL0T3Ayw0MpYfmor7vlMW1EMxoBsETxxOLW TvmUU4h8GeMGbh5HEqz6iMw8rZBW1QzGGFJsBVOZfn0HabRXahllj8UQYI7dzyCdaubFJgKWjA1 X8jt1TYlItCsMS6KLKcR5WXyUAWCpRKCAoOWntoeGhKMUm64LpX8LdWicVtxq/f5i+M6Y7jrtsZ ct+3hJeFuIfNrDlBi/53VUi6MjKFMaNzNzHQOmpdzzA= X-Received: by 2002:a05:600c:6745:b0:456:f22:ca49 with SMTP id 5b1f17b1804b1-4563449a16emr18017365e9.0.1752733661132; Wed, 16 Jul 2025 23:27:41 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH1XdPhCgnraxxi8qxxo8/12t8LAf8ivJMssB9G7xv1uNYfE0QS9/J0i1fsnRF4wH1Wmzq28g== X-Received: by 2002:a05:600c:6745:b0:456:f22:ca49 with SMTP id 5b1f17b1804b1-4563449a16emr18017075e9.0.1752733660617; Wed, 16 Jul 2025 23:27:40 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: qemu-rust@nongnu.org, manos.pitsidianakis@linaro.org Subject: [PATCH 4/4] qemu-api-macros: switch #[property] parsing to use combinators Date: Thu, 17 Jul 2025 08:27:27 +0200 Message-ID: <20250717062727.305466-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250717062727.305466-1-pbonzini@redhat.com> References: <20250717062727.305466-1-pbonzini@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.129.124; envelope-from=pbonzini@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1752734926489116600 Content-Type: text/plain; charset="utf-8" attrs is a simple crate that provides parser combinators for attribute arguments. Use it instead of a handwritten parser, and adjust tests. Signed-off-by: Paolo Bonzini --- rust/qemu-api-macros/src/lib.rs | 84 +++++++++++-------------------- rust/qemu-api-macros/src/tests.rs | 8 +-- 2 files changed, 35 insertions(+), 57 deletions(-) diff --git a/rust/qemu-api-macros/src/lib.rs b/rust/qemu-api-macros/src/lib= .rs index a0a8d758bcc..b3d44da9300 100644 --- a/rust/qemu-api-macros/src/lib.rs +++ b/rust/qemu-api-macros/src/lib.rs @@ -3,11 +3,11 @@ // SPDX-License-Identifier: GPL-2.0-or-later =20 use proc_macro::TokenStream; -use quote::{quote, quote_spanned, ToTokens}; +use quote::{quote, quote_spanned}; use syn::{ - parse::Parse, parse_macro_input, parse_quote, punctuated::Punctuated, = spanned::Spanned, - token::Comma, Data, DeriveInput, Error, Field, Fields, FieldsUnnamed, = Ident, Meta, Path, Token, - Variant, + parse::Parse, parse::ParseStream, parse_macro_input, parse_quote, punc= tuated::Punctuated, + spanned::Spanned, token::Comma, Attribute, Data, DeriveInput, Error, F= ield, Fields, FieldsUnnamed, + Ident, Meta, Path, Token, Variant, }; mod bits; use bits::BitsConstInternal; @@ -153,61 +153,37 @@ enum DevicePropertyName { Str(syn::LitStr), } =20 -#[derive(Debug)] +impl Parse for DevicePropertyName { + fn parse(input: ParseStream<'_>) -> syn::Result { + let lo =3D input.lookahead1(); + if lo.peek(syn::LitStr) { + Ok(Self::Str(input.parse()?)) + } else if lo.peek(syn::LitCStr) { + Ok(Self::CStr(input.parse()?)) + } else { + Err(lo.error()) + } + } +} + +#[derive(Default, Debug)] struct DeviceProperty { rename: Option, defval: Option, } =20 -impl Parse for DeviceProperty { - fn parse(input: syn::parse::ParseStream) -> syn::Result { - let _: syn::Token![#] =3D input.parse()?; - let bracketed; - _ =3D syn::bracketed!(bracketed in input); - let attribute =3D bracketed.parse::()?; - debug_assert_eq!(&attribute.to_string(), "property"); - let mut retval =3D Self { - rename: None, - defval: None, - }; - let content; - _ =3D syn::parenthesized!(content in bracketed); - while !content.is_empty() { - let value: syn::Ident =3D content.parse()?; - if value =3D=3D "rename" { - let _: syn::Token![=3D] =3D content.parse()?; - if retval.rename.is_some() { - return Err(syn::Error::new( - value.span(), - "`rename` can only be used at most once", - )); - } - if content.peek(syn::LitStr) { - retval.rename =3D Some(DevicePropertyName::Str(content= .parse::()?)); - } else { - retval.rename =3D - Some(DevicePropertyName::CStr(content.parse::()?)); - } - } else if value =3D=3D "default" { - let _: syn::Token![=3D] =3D content.parse()?; - if retval.defval.is_some() { - return Err(syn::Error::new( - value.span(), - "`default` can only be used at most once", - )); - } - retval.defval =3D Some(content.parse()?); - } else { - return Err(syn::Error::new( - value.span(), - format!("unrecognized field `{value}`"), - )); - } +impl DeviceProperty { + fn parse_from(&mut self, a: &Attribute) -> syn::Result<()> { + use attrs::{set, with, Attrs}; + let mut parser =3D Attrs::new(); + parser.once("rename", with::eq(set::parse(&mut self.rename))); + parser.once("default", with::eq(set::parse(&mut self.defval))); + a.parse_args_with(&mut parser) + } =20 - if !content.is_empty() { - let _: syn::Token![,] =3D content.parse()?; - } - } + fn parse(a: &Attribute) -> syn::Result { + let mut retval =3D Self::default(); + retval.parse_from(a)?; Ok(retval) } } @@ -229,7 +205,7 @@ fn derive_device_or_error(input: DeriveInput) -> Result= , Error>>()?; let name =3D &input.ident; diff --git a/rust/qemu-api-macros/src/tests.rs b/rust/qemu-api-macros/src/t= ests.rs index 0e5a5728908..3c056652666 100644 --- a/rust/qemu-api-macros/src/tests.rs +++ b/rust/qemu-api-macros/src/tests.rs @@ -60,7 +60,7 @@ struct DummyState { migrate_clock: bool, } }, - "unrecognized field `defalt`" + "Expected one of `default` or `rename`" ); // Check that repeated attributes are not allowed: derive_compile_fail!( @@ -73,7 +73,8 @@ struct DummyState { migrate_clock: bool, } }, - "`rename` can only be used at most once" + "Duplicate argument", + "Already used here", ); derive_compile_fail!( derive_device_or_error, @@ -85,7 +86,8 @@ struct DummyState { migrate_clock: bool, } }, - "`default` can only be used at most once" + "Duplicate argument", + "Already used here", ); // Check that the field name is preserved when `rename` isn't used: derive_compile!( --=20 2.50.1