From nobody Sat May 30 17:44:37 2026 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=1779787596; cv=none; d=zohomail.com; s=zohoarc; b=bngg7dL3thOtOXkJR9m+lEarJZxbBxKNaB7BAPt61yThRqI8xdnOL5zKbRL7sJfNrNi4oL2sbbGhhQzeARbcxPTqdWRrzqwIC5tHdjHlybY5cfRd75nx7yeXcMn0b5JdIYURGFmdWl3pzz/AWUwwozToid2TWxH1+33FjPnOkfI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779787596; h=Content-Transfer-Encoding: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:Cc; bh=cAYxsNAglrMaiNid1rXS9baybLvBVW9RpVrfRuZBMdA=; b=aXoP9N+Hhrm2HuPpmFBFwT63iTp+FHh9mfohNrjZk5f1V/KX9XW4vMDngv9Oo/Jp0tgVBI+TOvcONca8QHz7jWISEOfBB7sTLfd0uLiSfpQiKnkZAFztTslfHZWtbaqbkC9e429hYH5TwgHJft7xgJFzhjZrgwMK+11bKYHdEtE= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779787596228476.39755245990386; Tue, 26 May 2026 02:26:36 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRo2u-0007JT-Qp; Tue, 26 May 2026 05:25:56 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRo2t-0007Iv-06 for qemu-devel@nongnu.org; Tue, 26 May 2026 05:25:55 -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 1wRo2r-0006wE-E9 for qemu-devel@nongnu.org; Tue, 26 May 2026 05:25: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-663-qOJzXxJfPhCvI927QYrgZw-1; Tue, 26 May 2026 05:25:50 -0400 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-49051422d55so29551295e9.2 for ; Tue, 26 May 2026 02:25:50 -0700 (PDT) Received: from [192.168.10.48] ([151.49.251.208]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6cd151asm33282203f8f.13.2026.05.26.02.25.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 02:25:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779787552; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=cAYxsNAglrMaiNid1rXS9baybLvBVW9RpVrfRuZBMdA=; b=NAksJYpfd6KPbK7FrdefoUCEO9wJUSEhJ9+1omrTIpbayNt6UUqfHmPtW48RpYSI77lmJk lAN01zh9Hfn0DoNrMJibzl5IHtCmR6Ly0k8nHNyj2Krn/I+C8P2Vl2KccDI2J1ioH610o9 iQ/pg7IYD1F0KD5wVUKzB/K3KQa4G88= X-MC-Unique: qOJzXxJfPhCvI927QYrgZw-1 X-Mimecast-MFC-AGG-ID: qOJzXxJfPhCvI927QYrgZw_1779787549 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1779787549; x=1780392349; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=cAYxsNAglrMaiNid1rXS9baybLvBVW9RpVrfRuZBMdA=; b=BJTSKXHu0xtH0y5irRBghh+8QuydArEKTM9GYKy5IWVIB/zgVZ+GW+oJU+jjVByDHR /9cBZPYhxYoY37EknTxmye4PgjqRMZSd3oWbxzL23AJX3sLAhaPhPK3BLU4ShK+wBXMl XTH2iaK86ny/7YRNQnIc6Rh5WSQQn49BE+RwTpo9hIq29cctXbWRd3HFbBcEk+qyPOjB QpY9U7EAw4Lf73C95t5B5bLHa5SPVfsC//C6LJYqLP+gQNtv6o0bWzklGXC1pQAfqcUa cQuALFt1cNiPU6PknYV41Fc0EoIuuS/agETja1yrqLnmdQlDuSvuejxAJApXBlhPhW0/ Mysw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779787549; x=1780392349; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=cAYxsNAglrMaiNid1rXS9baybLvBVW9RpVrfRuZBMdA=; b=lNi3zTURMI+5LsehGH3W+phexxrpM8X2GjgnMZE+2pQUPsxjtxT8CknOxJrnEKTFrb Tq4Lczxj+9davjw8roafbXzor0XAHlSIPep9aaINw/hv6Z3UT6Lxi48ivdDnDBLNoLMF JGyWtueDGdShmuEI7mwF+lBBCL7F4ofh1XEATMCpxw8nj4D1z2CtskIQs6WgMuaeK5Fw 9XCuR9WFKfKZaysmbZBoW6t0vrj9TebGx2hhYv/GOjAzG81yoynUeuiWatd4CvjgmkOY AihLzfpjhf/IeXpvwgWq+bDi6RRKVKcicqDru5vZJRif7CWUqP1gQcc1PyiqBuzXLhQY GtAw== X-Gm-Message-State: AOJu0YxY/ukgK8OSZrpqrGsxyuCSFRYEQ6BQEFcxMIUqLsxZmoDyyBgP w4jo+5IXZpWJebWyxc1K8iTB8T0EX5LeNDcD55dn83TyFrssBgPeokQCrJ0ZHI5iS6zrFcsiJx3 iw6Ygu7gAoyoy1yEX5uqT6nxvaTWBIQPZh0UDAOgJLjTSBPrxEJmZDeXPozBezrGgAcmZTepPPv MdR9ucTogIlkVJh5/6gZhRtd3HsFPUTC2aUR51Z5ft X-Gm-Gg: Acq92OHQrftIgZQYu1b4X3Wy12iFgChXncc887cBAaPdmemCabTyAcMPnoreOrABSAS 683JqgJpcrHG08XpW/JQY3ep9vgzgPA2rmFU39+7cJ3WWpwEX1T0rWTNBnAwwCNhuXrjuAKFmcO ehOLtQ/cT1COd22KNlDqgmnINkNen7iJCjoQe32I/4ZxiOODaKDtEEqiLXLUCQep7CoSCPN8t5k ZRqd1EAGSGgK4WkH0JoAmb2xH0fY8sa5WNpHDXv2VMFORU574x/X+y97qglk5RdDNm+E1yb6URM 4SZ6jSN3+vXiSQ7HisZctfya01Pa1Nu+QfEvBp0+PSqIOOoQSfs/mmStEhUh43ueZULT78jU6D9 TEwnbE9EaSZiKYqJ8mOmOpppMWpXpm4KXtxjDx/2FXA3uNay3jiBccFz5uOLfKT29fQBrn8srQ8 2uET1dg5oEvC55oRh76ztkEiyBianB7MPDo9sgkA== X-Received: by 2002:a05:600c:4594:b0:490:601f:d784 with SMTP id 5b1f17b1804b1-490601fd8d6mr145884435e9.2.1779787549192; Tue, 26 May 2026 02:25:49 -0700 (PDT) X-Received: by 2002:a05:600c:4594:b0:490:601f:d784 with SMTP id 5b1f17b1804b1-490601fd8d6mr145883885e9.2.1779787548794; Tue, 26 May 2026 02:25:48 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 1/6] meson: use compiler_target() to get rustc target Date: Tue, 26 May 2026 11:25:40 +0200 Message-ID: <20260526092546.149241-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260526092546.149241-1-pbonzini@redhat.com> References: <20260526092546.149241-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=lists1p.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: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_H4=0.001, RCVD_IN_MSPIKE_WL=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: qemu development 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: 1779787597367154100 Content-Type: text/plain; charset="utf-8" The new method in Meson 1.11.x removes the need to pass the triple via config-host.mak. Signed-off-by: Paolo Bonzini --- configure | 3 --- meson.build | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/configure b/configure index e138d83bc9f..fdd2294db68 100755 --- a/configure +++ b/configure @@ -1747,9 +1747,6 @@ if test "$runc" !=3D no; then echo "CONTAINER_ENGINE=3D$container_engine" >> $config_host_mak fi echo "SUBDIRS=3D$subdirs" >> $config_host_mak -if test "$rust" !=3D disabled; then - echo "RUST_TARGET_TRIPLE=3D$rust_target_triple" >> $config_host_mak -fi echo "PYTHON=3D$python" >> $config_host_mak echo "MKVENV_ENSUREGROUP=3D$mkvenv ensuregroup $mkvenv_online_flag" >> $co= nfig_host_mak echo "GENISOIMAGE=3D$genisoimage" >> $config_host_mak diff --git a/meson.build b/meson.build index bda5180c436..c265a00aed6 100644 --- a/meson.build +++ b/meson.build @@ -4727,7 +4727,7 @@ else endif summary_info +=3D {'Rust support': have_rust} if have_rust - summary_info +=3D {'Rust target': config_host['RUST_TARGET_TRIPLE']} + summary_info +=3D {'Rust target': rust.compiler_target(native: false= )} summary_info +=3D {'rustc': ' '.join(rustc.cmd_array())} summary_info +=3D {'rustc version': rustc.version()} summary_info +=3D {'rustdoc': rustdoc} --=20 2.54.0 From nobody Sat May 30 17:44:37 2026 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=1779787598; cv=none; d=zohomail.com; s=zohoarc; b=Qhe5TFE2ulFLfx4iHtr6MKJK1jvsKUmnfwo3of3geeED8oIS2kzyPnUx8Ae8fWbcX5mI653ZsCXhpdnMAOj3rfrhVQnF7GVFnJnV6dilHk2FEh+ERRdLdUY83vj96E6GE2fTwf4vmpneCxPwQsYXDn9ZEf39TKixsnmrxQczXI8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779787598; h=Content-Transfer-Encoding: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:Cc; bh=MEGdCbUofPtIcGQH3KB5wa2VZQM5oIMJXiQ94dNbrTU=; b=hK/DzBfv1xMVfNVS9jg8ARWDzQdVm/TfaoiVjCafnVRPdqJJ/3c0aBEng59w+mhblXJ2VuVRXHn4kwYg6GKccdms13HY0OOVZq1hjw3xl5GaccN/vneCYGhuj69mBo7ZgYtLgMHzUmbIg2YdJK2502Nx+GgnjVmvNQvL8qqLoy4= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779787598779643.2920296420832; Tue, 26 May 2026 02:26:38 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRo2x-0007K7-A8; Tue, 26 May 2026 05:25:59 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRo2w-0007JZ-9b for qemu-devel@nongnu.org; Tue, 26 May 2026 05:25:58 -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 1wRo2t-0006wW-FD for qemu-devel@nongnu.org; Tue, 26 May 2026 05:25:57 -0400 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-633-Bbd-OPdHOy6TFU6wlsAGDg-1; Tue, 26 May 2026 05:25:52 -0400 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-49045243094so57297975e9.2 for ; Tue, 26 May 2026 02:25:52 -0700 (PDT) Received: from [192.168.10.48] ([151.49.251.208]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-490454b7d57sm307668755e9.15.2026.05.26.02.25.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 02:25:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779787554; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MEGdCbUofPtIcGQH3KB5wa2VZQM5oIMJXiQ94dNbrTU=; b=hkF7EPcoRTwNc3tKcLxHa3yUs5MOkVWwpECH8c17evZaLxMNqZjnuVJTfpO6GsHDRwLbIm Nh0XOlvbMhO0UHSUoSaNlhs6YODHQTSqbOUiurgjMJ7tlql7tjqsrn3W/pW1m717wbPYiw id4IcST3UfKfSLgLJG9hPWZBW5DT7tY= X-MC-Unique: Bbd-OPdHOy6TFU6wlsAGDg-1 X-Mimecast-MFC-AGG-ID: Bbd-OPdHOy6TFU6wlsAGDg_1779787552 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1779787552; x=1780392352; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=MEGdCbUofPtIcGQH3KB5wa2VZQM5oIMJXiQ94dNbrTU=; b=iBhMdb9O/eKlx+J37/VL0228ISvvSm44XkMrIvk1M+1lm2Df/uz0h7cCgSH7xRRfsg UlVnYYV5SR24+r6YbY/R4qM5JjndHoqRMY3lWzAeW5NQxgyb0GDJzHdGCNEh42tZN2rS 9NQJBw5WqtZRkFWiBleXiolv6V3q1fePwphQ+T5Yma8NWqI1pOCOE8VNF7Yr69SUipv7 etFd9QKkDdScR9sFl54fLz251aXz8D9wV+ELSwgS8oeKEZkbHnD3Tiaz4tPu7uZcfuh6 SZ66Lex7s/RFf3J6PTh6MiII2Gfj9AKNyHz1O6wq9p4eQ9AgyO0q5BTSJUr3+zAhLIH9 uk7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779787552; x=1780392352; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=MEGdCbUofPtIcGQH3KB5wa2VZQM5oIMJXiQ94dNbrTU=; b=aC/UYmP3I5i5MtBfJ/Df53ML8rAHum2sjLLyV9sOhszkWAyU41vydyuR0RM22miTZj DL6oO1mb5biDF6Es4U+SbbrO+IOWG2I34IX+S4Cpg/IP75G4DcFWkv4fRUwMH6XDvroB 7ohtdo0Jmf7n1h70kUOEc6aFNeLyd5o/6Z57HJj2khWrjt0MFjIjV5Q0N0w5oc5h+fX9 Mcqb4Vr6aojowS4BpIPxFDu5hQeUsdpVnHWWZjoSgdL6uAzuj+oyHLkOe/usS9/bfGV4 +tjotX1M7EzohHLpSxmbgUZ+HP4UQk+KX4p9iL99dED/kH4+2bU3SpitzAd5idx9Jlmb 1YnA== X-Gm-Message-State: AOJu0YwWScRuhwIBw+F7BAejgCD/h08nV7HUpcjYdwRWbpOJCDjtTqW7 JkqNkqLcD+o4HJ6G5WYQ0icUoRjLNIM7hMZDNhyz/QXU4sg6NH45b+LNV27tE86L8GvN8pODTOJ m+CYQldlLVYiYFEGwPUUYn0pJzx3U4tHCzSqeP20hN7m0N2tzre74o9SZcVhbWqZkXHUjy5iU9z tiuRLLu37e5Ah4BuI+jXEXGnFqtrakWB3pnbEWS09J X-Gm-Gg: Acq92OG4+TlTTwmki/wbCKu8kNH+hhZhMq8wi6fFS0e4I114Rg+lpTyIGFEaSVbarc3 FPqKz6eRsxWl1fTY8mQJJ05PnLC9/6f1z+iZ5xPzzmPfjn61z0qoJY5wylfxXgtGwEj6bvVt0hx b8rw171SyLMMuv1BD6/mujSiblPxSN5hUiSzqBEsjGh2xYHVjMvVCYmAFaVQe2J5Q//gPNAZV0g cOgz710U1c7OiXMJNPtVE5ITXGi5DJ1lz02n9CoToYLpG/FsuwEAafJOAjM5meZpt0CMjAVWekF e8L9rEYCbzf4FUxOAo4OgJImFadgXLUo3YRDmfzmEimUVzqW/Eq3E6WYVGtla5wmfNymAyrdrz/ xWE054Bgyb7VyGq4insKc1yt6Alu88beBkzjT7YyE95MO9G4ZSouRq/LBvGKQAuIZafnXpV4OUj aE3sQvlab53yFAmJCoExhUfCvZoMo= X-Received: by 2002:a05:600c:5288:b0:490:50e8:45c3 with SMTP id 5b1f17b1804b1-49050e846f9mr226346705e9.0.1779787551469; Tue, 26 May 2026 02:25:51 -0700 (PDT) X-Received: by 2002:a05:600c:5288:b0:490:50e8:45c3 with SMTP id 5b1f17b1804b1-49050e846f9mr226345545e9.0.1779787550562; Tue, 26 May 2026 02:25:50 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 2/6] rust: switch to cargo subprojects Date: Tue, 26 May 2026 11:25:41 +0200 Message-ID: <20260526092546.149241-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260526092546.149241-1-pbonzini@redhat.com> References: <20260526092546.149241-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=lists1p.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: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_H4=0.001, RCVD_IN_MSPIKE_WL=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: qemu development 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: 1779787601642154100 Content-Type: text/plain; charset="utf-8" Let Meson parse Cargo.lock and Cargo.toml and figure out the set of Rust build dependencies. For now, the only change is that subprojects are retrieved with "cargo_ws.subproject('NAME')" instead of "subproject('NAME-API-rs')". However, just calling "import('rust').workspace()" enables extra functionality that operates by parsing Cargo.toml; it will be introduced a step at a time in subsequent commits. Signed-off-by: Paolo Bonzini --- meson.build | 3 +- rust/Cargo.lock =3D> Cargo.lock | 0 rust/Cargo.toml =3D> Cargo.toml | 6 +-- rust/meson.build | 43 +++++++-------------- subprojects/anyhow-1-rs.wrap | 5 ++- subprojects/arbitrary-int-1-rs.wrap | 2 +- subprojects/attrs-0.2-rs.wrap | 5 ++- subprojects/bilge-0.2-rs.wrap | 2 +- subprojects/bilge-impl-0.2-rs.wrap | 4 +- subprojects/either-1-rs.wrap | 4 +- subprojects/foreign-0.3-rs.wrap | 5 ++- subprojects/glib-sys-0.21-rs.wrap | 5 ++- subprojects/itertools-0.11-rs.wrap | 4 +- subprojects/libc-0.2-rs.wrap | 2 +- subprojects/probe-0.5-rs.wrap | 5 ++- subprojects/proc-macro-error-1-rs.wrap | 4 +- subprojects/proc-macro-error-attr-1-rs.wrap | 4 +- subprojects/proc-macro2-1-rs.wrap | 4 +- subprojects/quote-1-rs.wrap | 4 +- subprojects/serde-1-rs.wrap | 4 +- subprojects/serde_core-1-rs.wrap | 4 +- subprojects/serde_derive-1-rs.wrap | 4 +- subprojects/syn-2-rs.wrap | 4 +- subprojects/unicode-ident-1-rs.wrap | 4 +- 24 files changed, 66 insertions(+), 65 deletions(-) rename rust/Cargo.lock =3D> Cargo.lock (100%) rename rust/Cargo.toml =3D> Cargo.toml (97%) diff --git a/meson.build b/meson.build index c265a00aed6..91d74fa198c 100644 --- a/meson.build +++ b/meson.build @@ -130,7 +130,8 @@ endif if have_rust rustc_args =3D [find_program('scripts/rust/rustc_args.py'), '--rustc-version', rustc.version(), - '--workspace', meson.project_source_root() / 'rust'] + '--workspace', meson.project_source_root()] + rustfmt =3D find_program('rustfmt', required: false) =20 rustc_lint_args =3D run_command(rustc_args, '--lints', diff --git a/rust/Cargo.lock b/Cargo.lock similarity index 100% rename from rust/Cargo.lock rename to Cargo.lock diff --git a/rust/Cargo.toml b/Cargo.toml similarity index 97% rename from rust/Cargo.toml rename to Cargo.toml index 15296ac8636..6bd38e2d8e1 100644 --- a/rust/Cargo.toml +++ b/Cargo.toml @@ -1,9 +1,9 @@ [workspace] resolver =3D "2" members =3D [ - "hw/char/pl011", - "hw/timer/hpet", - "tests", + "rust/hw/char/pl011", + "rust/hw/timer/hpet", + "rust/tests", ] =20 [workspace.package] diff --git a/rust/meson.build b/rust/meson.build index 96e93f56e22..d580c7cbeef 100644 --- a/rust/meson.build +++ b/rust/meson.build @@ -4,35 +4,20 @@ else message('Rust enabled but it is only used by system emulators.') endif =20 -subproject('anyhow-1-rs', required: true) -subproject('bilge-0.2-rs', required: true) -subproject('bilge-impl-0.2-rs', required: true) -subproject('foreign-0.3-rs', required: true) -subproject('glib-sys-0.21-rs', required: true) -subproject('libc-0.2-rs', required: true) -subproject('probe-0.5-rs', required: true) -subproject('serde-1-rs', required: true) -subproject('serde_derive-1-rs', required: true) - -anyhow_rs =3D dependency('anyhow-1-rs') -bilge_rs =3D dependency('bilge-0.2-rs') -bilge_impl_rs =3D dependency('bilge-impl-0.2-rs') -foreign_rs =3D dependency('foreign-0.3-rs') -glib_sys_rs =3D dependency('glib-sys-0.21-rs') -libc_rs =3D dependency('libc-0.2-rs') -probe_rs =3D dependency('probe-0.5-rs') -serde_rs =3D dependency('serde-1-rs') -serde_derive_rs =3D dependency('serde_derive-1-rs', native: true) - -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) - -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) +cargo_ws =3D import('rust').workspace() +anyhow_rs =3D cargo_ws.subproject('anyhow').dependency() +bilge_rs =3D cargo_ws.subproject('bilge').dependency() +bilge_impl_rs =3D cargo_ws.subproject('bilge-impl').dependency() +foreign_rs =3D cargo_ws.subproject('foreign').dependency() +glib_sys_rs =3D cargo_ws.subproject('glib-sys').dependency() +libc_rs =3D cargo_ws.subproject('libc').dependency() +probe_rs =3D cargo_ws.subproject('probe').dependency() +serde_rs =3D cargo_ws.subproject('serde').dependency() +serde_derive_rs =3D cargo_ws.subproject('serde_derive').dependency() +quote_rs_native =3D cargo_ws.subproject('quote').dependency() +syn_rs_native =3D cargo_ws.subproject('syn').dependency() +proc_macro2_rs_native =3D cargo_ws.subproject('proc-macro2').dependency() +attrs_rs_native =3D cargo_ws.subproject('attrs').dependency() =20 genrs =3D [] =20 diff --git a/subprojects/anyhow-1-rs.wrap b/subprojects/anyhow-1-rs.wrap index a69a3645b49..132c70c467e 100644 --- a/subprojects/anyhow-1-rs.wrap +++ b/subprojects/anyhow-1-rs.wrap @@ -3,5 +3,8 @@ directory =3D anyhow-1.0.98 source_url =3D https://crates.io/api/v1/crates/anyhow/1.0.98/download source_filename =3D anyhow-1.0.98.tar.gz source_hash =3D e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969b= dcd487 -#method =3D cargo +method =3D cargo patch_directory =3D anyhow-1-rs + +# bump this version number on every change to meson.build or the patches: +# v2 diff --git a/subprojects/arbitrary-int-1-rs.wrap b/subprojects/arbitrary-in= t-1-rs.wrap index a1838b20b0f..f8d7c68da64 100644 --- a/subprojects/arbitrary-int-1-rs.wrap +++ b/subprojects/arbitrary-int-1-rs.wrap @@ -3,7 +3,7 @@ directory =3D arbitrary-int-1.2.7 source_url =3D https://crates.io/api/v1/crates/arbitrary-int/1.2.7/download source_filename =3D arbitrary-int-1.2.7.tar.gz source_hash =3D c84fc003e338a6f69fbd4f7fe9f92b535ff13e9af8997f3b14b6ddff8b= 1df46d -#method =3D cargo +method =3D cargo patch_directory =3D arbitrary-int-1-rs =20 # bump this version number on every change to meson.build or the patches: diff --git a/subprojects/attrs-0.2-rs.wrap b/subprojects/attrs-0.2-rs.wrap index cd43c91d63e..99d2e43fb3b 100644 --- a/subprojects/attrs-0.2-rs.wrap +++ b/subprojects/attrs-0.2-rs.wrap @@ -3,5 +3,8 @@ 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 +method =3D cargo patch_directory =3D attrs-0.2-rs + +# bump this version number on every change to meson.build or the patches: +# v2 diff --git a/subprojects/bilge-0.2-rs.wrap b/subprojects/bilge-0.2-rs.wrap index 900bb1497b9..cb202cfd9fe 100644 --- a/subprojects/bilge-0.2-rs.wrap +++ b/subprojects/bilge-0.2-rs.wrap @@ -3,7 +3,7 @@ directory =3D bilge-0.2.0 source_url =3D https://crates.io/api/v1/crates/bilge/0.2.0/download source_filename =3D bilge-0.2.0.tar.gz source_hash =3D dc707ed8ebf81de5cd6c7f48f54b4c8621760926cdf35a57000747c512= e67b57 -#method =3D cargo +method =3D cargo patch_directory =3D bilge-0.2-rs =20 # bump this version number on every change to meson.build or the patches: diff --git a/subprojects/bilge-impl-0.2-rs.wrap b/subprojects/bilge-impl-0.= 2-rs.wrap index 4f84eca1ccd..e423b6cec66 100644 --- a/subprojects/bilge-impl-0.2-rs.wrap +++ b/subprojects/bilge-impl-0.2-rs.wrap @@ -3,8 +3,8 @@ directory =3D bilge-impl-0.2.0 source_url =3D https://crates.io/api/v1/crates/bilge-impl/0.2.0/download source_filename =3D bilge-impl-0.2.0.tar.gz source_hash =3D feb11e002038ad243af39c2068c8a72bcf147acf05025dcdb916fcc000= adb2d8 -#method =3D cargo +method =3D cargo patch_directory =3D bilge-impl-0.2-rs =20 # bump this version number on every change to meson.build or the patches: -# v2 +# v3 diff --git a/subprojects/either-1-rs.wrap b/subprojects/either-1-rs.wrap index 352e11cfee6..b70787d882e 100644 --- a/subprojects/either-1-rs.wrap +++ b/subprojects/either-1-rs.wrap @@ -3,8 +3,8 @@ directory =3D either-1.12.0 source_url =3D https://crates.io/api/v1/crates/either/1.12.0/download source_filename =3D either-1.12.0.tar.gz source_hash =3D 3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb233= 85b58b -#method =3D cargo +method =3D cargo patch_directory =3D either-1-rs =20 # bump this version number on every change to meson.build or the patches: -# v2 +# v3 diff --git a/subprojects/foreign-0.3-rs.wrap b/subprojects/foreign-0.3-rs.w= rap index 0d218ec2c25..bae22b1f2a3 100644 --- a/subprojects/foreign-0.3-rs.wrap +++ b/subprojects/foreign-0.3-rs.wrap @@ -3,5 +3,8 @@ directory =3D foreign-0.3.1 source_url =3D https://crates.io/api/v1/crates/foreign/0.3.1/download source_filename =3D foreign-0.3.1.tar.gz source_hash =3D 17ca1b5be8c9d320daf386f1809c7acc0cb09accbae795c2001953fa50= 585846 -#method =3D cargo +method =3D cargo patch_directory =3D foreign-0.3-rs + +# bump this version number on every change to meson.build or the patches: +# v2 diff --git a/subprojects/glib-sys-0.21-rs.wrap b/subprojects/glib-sys-0.21-= rs.wrap index 313ced731ac..af849352a38 100644 --- a/subprojects/glib-sys-0.21-rs.wrap +++ b/subprojects/glib-sys-0.21-rs.wrap @@ -3,5 +3,8 @@ directory =3D glib-sys-0.21.2 source_url =3D https://crates.io/api/v1/crates/glib-sys/0.21.2/download source_filename =3D glib-sys-0.21.2.tar.gz source_hash =3D d09d3d0fddf7239521674e57b0465dfbd844632fec54f059f7f56112e3= f927e1 -#method =3D cargo +method =3D cargo patch_directory =3D glib-sys-0.21-rs + +# bump this version number on every change to meson.build or the patches: +# v2 diff --git a/subprojects/itertools-0.11-rs.wrap b/subprojects/itertools-0.1= 1-rs.wrap index ee12d0053bc..b52a2314340 100644 --- a/subprojects/itertools-0.11-rs.wrap +++ b/subprojects/itertools-0.11-rs.wrap @@ -3,8 +3,8 @@ directory =3D itertools-0.11.0 source_url =3D https://crates.io/api/v1/crates/itertools/0.11.0/download source_filename =3D itertools-0.11.0.tar.gz source_hash =3D b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418= c3fe57 -#method =3D cargo +method =3D cargo patch_directory =3D itertools-0.11-rs =20 # bump this version number on every change to meson.build or the patches: -# v2 +# v3 diff --git a/subprojects/libc-0.2-rs.wrap b/subprojects/libc-0.2-rs.wrap index bbe08f87883..488330178ed 100644 --- a/subprojects/libc-0.2-rs.wrap +++ b/subprojects/libc-0.2-rs.wrap @@ -3,5 +3,5 @@ directory =3D libc-0.2.162 source_url =3D https://crates.io/api/v1/crates/libc/0.2.162/download source_filename =3D libc-0.2.162.tar.gz source_hash =3D 18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01= 506398 -#method =3D cargo +method =3D cargo patch_directory =3D libc-0.2-rs diff --git a/subprojects/probe-0.5-rs.wrap b/subprojects/probe-0.5-rs.wrap index 73229ee1c29..bd23c0ea789 100644 --- a/subprojects/probe-0.5-rs.wrap +++ b/subprojects/probe-0.5-rs.wrap @@ -3,5 +3,8 @@ directory =3D probe-0.5.2 source_url =3D https://crates.io/api/v1/crates/probe/0.5.2/download source_filename =3D probe-0.5.2.tar.gz source_hash =3D 136558b6e1ebaecc92755d0ffaf9421f519531bed30cc2ad23b22cb009= 65cc5e -#method =3D cargo +method =3D cargo patch_directory =3D probe-0.5-rs + +# bump this version number on every change to meson.build or the patches: +# v1 diff --git a/subprojects/proc-macro-error-1-rs.wrap b/subprojects/proc-macr= o-error-1-rs.wrap index 59f892f7825..e57921bfadc 100644 --- a/subprojects/proc-macro-error-1-rs.wrap +++ b/subprojects/proc-macro-error-1-rs.wrap @@ -3,8 +3,8 @@ directory =3D proc-macro-error-1.0.4 source_url =3D https://crates.io/api/v1/crates/proc-macro-error/1.0.4/down= load source_filename =3D proc-macro-error-1.0.4.tar.gz source_hash =3D da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a= 5ce38c -#method =3D cargo +method =3D cargo patch_directory =3D proc-macro-error-1-rs =20 # bump this version number on every change to meson.build or the patches: -# v2 +# v3 diff --git a/subprojects/proc-macro-error-attr-1-rs.wrap b/subprojects/proc= -macro-error-attr-1-rs.wrap index 5aeb224a103..02d18f3393d 100644 --- a/subprojects/proc-macro-error-attr-1-rs.wrap +++ b/subprojects/proc-macro-error-attr-1-rs.wrap @@ -3,8 +3,8 @@ directory =3D proc-macro-error-attr-1.0.4 source_url =3D https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4= /download source_filename =3D proc-macro-error-attr-1.0.4.tar.gz source_hash =3D a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b= 35f869 -#method =3D cargo +method =3D cargo patch_directory =3D proc-macro-error-attr-1-rs =20 # bump this version number on every change to meson.build or the patches: -# v2 +# v3 diff --git a/subprojects/proc-macro2-1-rs.wrap b/subprojects/proc-macro2-1-= rs.wrap index 0f06cd8e111..676d1a3a8ca 100644 --- a/subprojects/proc-macro2-1-rs.wrap +++ b/subprojects/proc-macro2-1-rs.wrap @@ -3,8 +3,8 @@ 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 +method =3D cargo patch_directory =3D proc-macro2-1-rs =20 # bump this version number on every change to meson.build or the patches: -# v2 +# v3 diff --git a/subprojects/quote-1-rs.wrap b/subprojects/quote-1-rs.wrap index 8b721dfa00b..dab58490a4f 100644 --- a/subprojects/quote-1-rs.wrap +++ b/subprojects/quote-1-rs.wrap @@ -3,8 +3,8 @@ directory =3D quote-1.0.36 source_url =3D https://crates.io/api/v1/crates/quote/1.0.36/download source_filename =3D quote-1.0.36.0.tar.gz source_hash =3D 0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208= acaca7 -#method =3D cargo +method =3D cargo patch_directory =3D quote-1-rs =20 # bump this version number on every change to meson.build or the patches: -# v2 +# v3 diff --git a/subprojects/serde-1-rs.wrap b/subprojects/serde-1-rs.wrap index 56746dd0f43..9792592d480 100644 --- a/subprojects/serde-1-rs.wrap +++ b/subprojects/serde-1-rs.wrap @@ -3,9 +3,9 @@ directory =3D serde-1.0.226 source_url =3D https://crates.io/api/v1/crates/serde/1.0.226/download source_filename =3D serde-1.0.226.0.tar.gz source_hash =3D 0dca6411025b24b60bfa7ec1fe1f8e710ac09782dca409ee8237ba74b5= 1295fd -#method =3D cargo +method =3D cargo diff_files =3D serde-1.0.226-include.patch patch_directory =3D serde-1-rs =20 # bump this version number on every change to meson.build or the patches: -# v1 +# v2 diff --git a/subprojects/serde_core-1-rs.wrap b/subprojects/serde_core-1-rs= .wrap index 3692e754935..ff2e59430b1 100644 --- a/subprojects/serde_core-1-rs.wrap +++ b/subprojects/serde_core-1-rs.wrap @@ -3,9 +3,9 @@ directory =3D serde_core-1.0.226 source_url =3D https://crates.io/api/v1/crates/serde_core/1.0.226/download source_filename =3D serde_core-1.0.226.0.tar.gz source_hash =3D ba2ba63999edb9dac981fb34b3e5c0d111a69b0924e253ed29d83f7c99= e966a4 -#method =3D cargo +method =3D cargo diff_files =3D serde_core-1.0.226-include.patch patch_directory =3D serde_core-1-rs =20 # bump this version number on every change to meson.build or the patches: -# v1 +# v2 diff --git a/subprojects/serde_derive-1-rs.wrap b/subprojects/serde_derive-= 1-rs.wrap index 00c92dc79cf..ed345a7f840 100644 --- a/subprojects/serde_derive-1-rs.wrap +++ b/subprojects/serde_derive-1-rs.wrap @@ -3,9 +3,9 @@ directory =3D serde_derive-1.0.226 source_url =3D https://crates.io/api/v1/crates/serde_derive/1.0.226/downlo= ad source_filename =3D serde_derive-1.0.226.0.tar.gz source_hash =3D 8db53ae22f34573731bafa1db20f04027b2d25e02d8205921b56917169= 9cdb33 -#method =3D cargo +method =3D cargo diff_files =3D serde_derive-1.0.226-include.patch patch_directory =3D serde_derive-1-rs =20 # bump this version number on every change to meson.build or the patches: -# v1 +# v2 diff --git a/subprojects/syn-2-rs.wrap b/subprojects/syn-2-rs.wrap index 1e5e9d9fb6e..4b545c7980c 100644 --- a/subprojects/syn-2-rs.wrap +++ b/subprojects/syn-2-rs.wrap @@ -3,8 +3,8 @@ 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 +method =3D cargo patch_directory =3D syn-2-rs =20 # bump this version number on every change to meson.build or the patches: -# v2 +# v3 diff --git a/subprojects/unicode-ident-1-rs.wrap b/subprojects/unicode-iden= t-1-rs.wrap index 50988f612e2..0a5e097953e 100644 --- a/subprojects/unicode-ident-1-rs.wrap +++ b/subprojects/unicode-ident-1-rs.wrap @@ -3,8 +3,8 @@ directory =3D unicode-ident-1.0.12 source_url =3D https://crates.io/api/v1/crates/unicode-ident/1.0.12/downlo= ad source_filename =3D unicode-ident-1.0.12.tar.gz source_hash =3D 3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec= 0fee4b -#method =3D cargo +method =3D cargo patch_directory =3D unicode-ident-1-rs =20 # bump this version number on every change to meson.build or the patches: -# v2 +# v3 --=20 2.54.0 From nobody Sat May 30 17:44:37 2026 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=1779787618; cv=none; d=zohomail.com; s=zohoarc; b=gEkxL+GB4cawTagatmUHNXpRYEZjU9hAZ0dNPEGuBtk+7xSBs2NWq8IRtpUdb3wlB6mLOb7GUyvHV22XIyIwAHjVlOGlIet540aqDQ78Ai4GhZbp3XqWLNFzP2HIs7cG2zCmAYOQLEm4FZzbMNXiZ2rMm1iYKG0P+xeh5PWQs5w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779787618; h=Content-Transfer-Encoding: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:Cc; bh=Plya1n2YtQ+n/HgAugBpezfsNZoVuzRmB8eN/v9e9Hc=; b=ltQ3frrexUhMJi7DwvIXMtsxL/nGR0rXPVO+5h64qCFZRtQCn4rmuijRpGpvhDggzRFmq7KgrV6y8cV7TXcJJAG5TnzrYrAFKKYqdaAbAn47gcNHuUbS8UP2AAPzYPdlPrA48Hr6MJh1u2sQmLJbTRXzLggoQLo3YpYkMbd6OUY= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779787618578709.1036153736728; Tue, 26 May 2026 02:26:58 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRo37-0007Ot-Rk; Tue, 26 May 2026 05:26:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRo35-0007M3-8r for qemu-devel@nongnu.org; Tue, 26 May 2026 05:26:07 -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 1wRo30-00074J-BN for qemu-devel@nongnu.org; Tue, 26 May 2026 05:26:06 -0400 Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-625-ClmCfUYUPPqwdhiPTU0a2w-1; Tue, 26 May 2026 05:25:55 -0400 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-49051422d55so29552205e9.2 for ; Tue, 26 May 2026 02:25:55 -0700 (PDT) Received: from [192.168.10.48] ([151.49.251.208]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-490428e5adcsm117301565e9.21.2026.05.26.02.25.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 02:25:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779787561; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Plya1n2YtQ+n/HgAugBpezfsNZoVuzRmB8eN/v9e9Hc=; b=ZZdmKfwctZW0Pptdl0bOchUxkzSxq+HgKeEWxaTjib2tfCyzoTKvi6NhWgtLQ/XOdbDK0u e98AeafHjUKovd9oCACVU6AFkHKNbL0O7bpyW2HGTf1rcB8Z7eKCq62olZFIOUG0NrY7oJ KR5evyK6nAhe/0ZdTb2+oXoduGoIJoY= X-MC-Unique: ClmCfUYUPPqwdhiPTU0a2w-1 X-Mimecast-MFC-AGG-ID: ClmCfUYUPPqwdhiPTU0a2w_1779787555 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1779787555; x=1780392355; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Plya1n2YtQ+n/HgAugBpezfsNZoVuzRmB8eN/v9e9Hc=; b=DwARCPhT8oBxCd2U+Zbar5aIKcDOn+lFzhERpE4io57l83bldoFiQwfWK/HjG/Z6TW FVwdi9IflZqbqK7FwchiZQG2gJyCdNcV6cxmSYCgk++4VdRIzCiQzsNxiYHsrTV1QAsi U2VyLRzojtfYAg/rgrizbqSHclt69teWRq9s2im5LA+JEa8JG60BrJJVgS0D44aFXCbK ExZDjEwgPCRIh4shf74RCItq4xbEWBmQLcW0mekiXcKfeZfvxUHPpQfT6+55GrjI1bhM EO1umi/AOa3tImQEFNR45mEV/VdGMeZk//5AwGA245WWFEZmB6EXb7L3LgNeYZAOEtZw 3tew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779787555; x=1780392355; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=Plya1n2YtQ+n/HgAugBpezfsNZoVuzRmB8eN/v9e9Hc=; b=sQLRse5Z18FRS0ZXgtRwusVuHFl3P9IhjucV0GenJLr7FB4xh06vU64ghgNBJQHNlk H7E0aQlBJpTS4f0vsaBaGwdmTxssCWlkMDr5EJhp0gWgNv25R0JeYnqVGjAvPFjghM8z hSgHUzCFWMz9xhzqj0s3cl4q3NpxbmtPkO+5glDkha2YS7+j5QM6YTCZG2Z/sE0+KPoD Xa3d5Z6GKk2DvkqrZeMMJKCDny+ZUZJot0hRNontGTGCo7wlfhdtH7Cxoz1uk9s2pF7V +c+gUCuFtv+CT9B7POEzUWV7JUzE6ADt9092L+L3H/RkxMKKy8uwmFy+Q3fNisXNDZXW 9L/Q== X-Gm-Message-State: AOJu0Yz5dbfTcr/6n6EB+IlGNUbGNehNkIO6D4emGFDzb3c8oQvVnnGl EgTiDwMmQ6MOs15eimnRHfLAW+mKXNFEKXJxzWWfqBCy31IlZCOxTVLvAKoFavZ/St3XnnaMKr8 M9A9h2qtFxXep0CZH4BHonPy5IZioOni4ShKtxeyJYmhAwIObo0a64Xd+kqeGUUtLNb34kXD3/v kPUcpkFLr6Ctj6t2dr7OgZEwnMpxI1AY7qbp90nztm X-Gm-Gg: Acq92OFA5SFWXzfn0rwj1pysbc0v+3Np1FGeWG91dLDqWIJHyGqp0/FHNxu7yItEOGB xEBdM+iyh81qb5up8LEgtANsAUGU+3SjmoLEmp6nBTKIt/EPRkfoRDTWzELLMGbZy4rt7EwGYcl vXIxqOSnML3FXMcsEKIUmFl3vzUWQQp5iRPm2nc38nwTI0Af5FB67wEILvjvSRz848enObhzgtC RG0VdVP0sjyTi416CgO0y3Id8diKmjMaQlp2JPK4dmiPqmLMMSCGBq7Knb6q63KevPynoNJ2YNV Hw900LBhDU90wIwS6ei9mNpjy4iOud0mDB6NSzEy9kTch+PfyLFBhBqu+HF/TPfH0fKqLewcl4W BAdvi94lo50GT3ngtb0G4T7lLlTN/j2ElIR7gUwqWWASfm4e5Vy1/DKxc4OGeuefg53k6FrZ2v9 ksMylNISjWnced8Ve+fB8Y3LuO8YaHka9aHM0/vg== X-Received: by 2002:a05:600c:4e43:b0:48f:e230:2a1d with SMTP id 5b1f17b1804b1-49042ae77b4mr312964255e9.32.1779787554105; Tue, 26 May 2026 02:25:54 -0700 (PDT) X-Received: by 2002:a05:600c:4e43:b0:48f:e230:2a1d with SMTP id 5b1f17b1804b1-49042ae77b4mr312962725e9.32.1779787552923; Tue, 26 May 2026 02:25:52 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 3/6] rust: switch to autogenerated meson rules Date: Tue, 26 May 2026 11:25:42 +0200 Message-ID: <20260526092546.149241-4-pbonzini@redhat.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260526092546.149241-1-pbonzini@redhat.com> References: <20260526092546.149241-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=lists1p.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: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_H4=0.001, RCVD_IN_MSPIKE_WL=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: qemu development 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: 1779787620622158500 Content-Type: text/plain; charset="utf-8" Meson can automatically generate most of the build rules for subprojects, based on the contents of their Cargo.toml. Handwritten snippets can be placed in meson/meson.build to replace build.rs. Signed-off-by: Paolo Bonzini --- scripts/qapi/rs_types.py | 2 +- subprojects/arbitrary-int-1-rs.wrap | 1 - subprojects/attrs-0.2-rs.wrap | 1 - subprojects/bilge-0.2-rs.wrap | 1 - subprojects/either-1-rs.wrap | 1 - subprojects/foreign-0.3-rs.wrap | 1 - subprojects/glib-sys-0.21-rs.wrap | 1 - subprojects/itertools-0.11-rs.wrap | 1 - .../packagefiles/anyhow-1-rs/meson.build | 33 -------------- .../anyhow-1-rs/meson/meson.build | 9 ++++ .../arbitrary-int-1-rs/meson.build | 21 --------- .../packagefiles/attrs-0.2-rs/meson.build | 33 -------------- .../packagefiles/bilge-0.2-rs/meson.build | 31 ------------- .../bilge-impl-0.2-rs/meson.build | 44 ------------------- .../bilge-impl-0.2-rs/meson/meson.build | 3 ++ .../packagefiles/either-1-rs/meson.build | 26 ----------- .../packagefiles/foreign-0.3-rs/meson.build | 26 ----------- .../packagefiles/glib-sys-0.21-rs/meson.build | 33 -------------- .../itertools-0.11-rs/meson.build | 32 -------------- .../packagefiles/libc-0.2-rs/meson.build | 37 ---------------- .../libc-0.2-rs/meson/meson.build | 16 +++++++ .../proc-macro-error-1-rs/meson.build | 41 ----------------- .../proc-macro-error-1-rs/meson/meson.build | 3 ++ .../proc-macro-error-attr-1-rs/meson.build | 31 ------------- .../meson/meson.build | 3 ++ .../packagefiles/proc-macro2-1-rs/meson.build | 35 --------------- .../proc-macro2-1-rs/meson/meson.build | 6 +++ .../packagefiles/quote-1-rs/meson.build | 31 ------------- .../packagefiles/serde-1-rs/meson.build | 36 --------------- .../packagefiles/serde_core-1-rs/meson.build | 25 ----------- .../serde_core-1-rs/private.rs.in | 6 +++ .../serde_derive-1-rs/meson.build | 35 --------------- subprojects/packagefiles/syn-2-rs/meson.build | 43 ------------------ .../unicode-ident-1-rs/meson.build | 22 ---------- subprojects/probe-0.5-rs.wrap | 1 - subprojects/quote-1-rs.wrap | 1 - subprojects/serde-1-rs.wrap | 1 - subprojects/serde_core-1-rs.wrap | 1 - subprojects/serde_derive-1-rs.wrap | 1 - subprojects/syn-2-rs.wrap | 1 - subprojects/unicode-ident-1-rs.wrap | 1 - 41 files changed, 47 insertions(+), 630 deletions(-) delete mode 100644 subprojects/packagefiles/anyhow-1-rs/meson.build create mode 100644 subprojects/packagefiles/anyhow-1-rs/meson/meson.build delete mode 100644 subprojects/packagefiles/arbitrary-int-1-rs/meson.build delete mode 100644 subprojects/packagefiles/attrs-0.2-rs/meson.build delete mode 100644 subprojects/packagefiles/bilge-0.2-rs/meson.build delete mode 100644 subprojects/packagefiles/bilge-impl-0.2-rs/meson.build create mode 100644 subprojects/packagefiles/bilge-impl-0.2-rs/meson/meson.= build delete mode 100644 subprojects/packagefiles/either-1-rs/meson.build delete mode 100644 subprojects/packagefiles/foreign-0.3-rs/meson.build delete mode 100644 subprojects/packagefiles/glib-sys-0.21-rs/meson.build delete mode 100644 subprojects/packagefiles/itertools-0.11-rs/meson.build delete mode 100644 subprojects/packagefiles/libc-0.2-rs/meson.build create mode 100644 subprojects/packagefiles/libc-0.2-rs/meson/meson.build delete mode 100644 subprojects/packagefiles/proc-macro-error-1-rs/meson.bu= ild create mode 100644 subprojects/packagefiles/proc-macro-error-1-rs/meson/me= son.build delete mode 100644 subprojects/packagefiles/proc-macro-error-attr-1-rs/mes= on.build create mode 100644 subprojects/packagefiles/proc-macro-error-attr-1-rs/mes= on/meson.build delete mode 100644 subprojects/packagefiles/proc-macro2-1-rs/meson.build create mode 100644 subprojects/packagefiles/proc-macro2-1-rs/meson/meson.b= uild delete mode 100644 subprojects/packagefiles/quote-1-rs/meson.build delete mode 100644 subprojects/packagefiles/serde-1-rs/meson.build delete mode 100644 subprojects/packagefiles/serde_core-1-rs/meson.build create mode 100644 subprojects/packagefiles/serde_core-1-rs/private.rs.in delete mode 100644 subprojects/packagefiles/serde_derive-1-rs/meson.build delete mode 100644 subprojects/packagefiles/syn-2-rs/meson.build delete mode 100644 subprojects/packagefiles/unicode-ident-1-rs/meson.build diff --git a/scripts/qapi/rs_types.py b/scripts/qapi/rs_types.py index e24f14af03d..3a8cf0e3e4b 100644 --- a/scripts/qapi/rs_types.py +++ b/scripts/qapi/rs_types.py @@ -348,7 +348,7 @@ def visit_begin(self, schema: QAPISchema) -> None: // that *could* be Eq too. #![allow(clippy::derive_partial_eq_without_eq)] =20 -use serde_derive::{Serialize, Deserialize}; +use serde::{Serialize, Deserialize}; =20 use util::qobject::QObject; ''')) diff --git a/subprojects/arbitrary-int-1-rs.wrap b/subprojects/arbitrary-in= t-1-rs.wrap index f8d7c68da64..5cf4b11e4a3 100644 --- a/subprojects/arbitrary-int-1-rs.wrap +++ b/subprojects/arbitrary-int-1-rs.wrap @@ -4,7 +4,6 @@ source_url =3D https://crates.io/api/v1/crates/arbitrary-in= t/1.2.7/download source_filename =3D arbitrary-int-1.2.7.tar.gz source_hash =3D c84fc003e338a6f69fbd4f7fe9f92b535ff13e9af8997f3b14b6ddff8b= 1df46d method =3D cargo -patch_directory =3D arbitrary-int-1-rs =20 # bump this version number on every change to meson.build or the patches: # v2 diff --git a/subprojects/attrs-0.2-rs.wrap b/subprojects/attrs-0.2-rs.wrap index 99d2e43fb3b..dcdddf005f6 100644 --- a/subprojects/attrs-0.2-rs.wrap +++ b/subprojects/attrs-0.2-rs.wrap @@ -4,7 +4,6 @@ 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 =20 # bump this version number on every change to meson.build or the patches: # v2 diff --git a/subprojects/bilge-0.2-rs.wrap b/subprojects/bilge-0.2-rs.wrap index cb202cfd9fe..cff10f6710d 100644 --- a/subprojects/bilge-0.2-rs.wrap +++ b/subprojects/bilge-0.2-rs.wrap @@ -4,7 +4,6 @@ source_url =3D https://crates.io/api/v1/crates/bilge/0.2.0/= download source_filename =3D bilge-0.2.0.tar.gz source_hash =3D dc707ed8ebf81de5cd6c7f48f54b4c8621760926cdf35a57000747c512= e67b57 method =3D cargo -patch_directory =3D bilge-0.2-rs =20 # bump this version number on every change to meson.build or the patches: # v2 diff --git a/subprojects/either-1-rs.wrap b/subprojects/either-1-rs.wrap index b70787d882e..d2808d3d7fb 100644 --- a/subprojects/either-1-rs.wrap +++ b/subprojects/either-1-rs.wrap @@ -4,7 +4,6 @@ source_url =3D https://crates.io/api/v1/crates/either/1.12.= 0/download source_filename =3D either-1.12.0.tar.gz source_hash =3D 3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb233= 85b58b method =3D cargo -patch_directory =3D either-1-rs =20 # bump this version number on every change to meson.build or the patches: # v3 diff --git a/subprojects/foreign-0.3-rs.wrap b/subprojects/foreign-0.3-rs.w= rap index bae22b1f2a3..e4aa7f11fc0 100644 --- a/subprojects/foreign-0.3-rs.wrap +++ b/subprojects/foreign-0.3-rs.wrap @@ -4,7 +4,6 @@ source_url =3D https://crates.io/api/v1/crates/foreign/0.3.= 1/download source_filename =3D foreign-0.3.1.tar.gz source_hash =3D 17ca1b5be8c9d320daf386f1809c7acc0cb09accbae795c2001953fa50= 585846 method =3D cargo -patch_directory =3D foreign-0.3-rs =20 # bump this version number on every change to meson.build or the patches: # v2 diff --git a/subprojects/glib-sys-0.21-rs.wrap b/subprojects/glib-sys-0.21-= rs.wrap index af849352a38..4723f7f63be 100644 --- a/subprojects/glib-sys-0.21-rs.wrap +++ b/subprojects/glib-sys-0.21-rs.wrap @@ -4,7 +4,6 @@ source_url =3D https://crates.io/api/v1/crates/glib-sys/0.2= 1.2/download source_filename =3D glib-sys-0.21.2.tar.gz source_hash =3D d09d3d0fddf7239521674e57b0465dfbd844632fec54f059f7f56112e3= f927e1 method =3D cargo -patch_directory =3D glib-sys-0.21-rs =20 # bump this version number on every change to meson.build or the patches: # v2 diff --git a/subprojects/itertools-0.11-rs.wrap b/subprojects/itertools-0.1= 1-rs.wrap index b52a2314340..fc63e2f57d9 100644 --- a/subprojects/itertools-0.11-rs.wrap +++ b/subprojects/itertools-0.11-rs.wrap @@ -4,7 +4,6 @@ source_url =3D https://crates.io/api/v1/crates/itertools/0.= 11.0/download source_filename =3D itertools-0.11.0.tar.gz source_hash =3D b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418= c3fe57 method =3D cargo -patch_directory =3D itertools-0.11-rs =20 # bump this version number on every change to meson.build or the patches: # v3 diff --git a/subprojects/packagefiles/anyhow-1-rs/meson.build b/subprojects= /packagefiles/anyhow-1-rs/meson.build deleted file mode 100644 index 348bab98b9f..00000000000 --- a/subprojects/packagefiles/anyhow-1-rs/meson.build +++ /dev/null @@ -1,33 +0,0 @@ -project('anyhow-1-rs', 'rust', - meson_version: '>=3D1.5.0', - version: '1.0.98', - license: 'MIT OR Apache-2.0', - default_options: []) - -rustc =3D meson.get_compiler('rust') - -rust_args =3D ['--cap-lints', 'allow'] -rust_args +=3D ['--cfg', 'feature=3D"std"'] -if rustc.version().version_compare('<1.65.0') - error('rustc version ' + rustc.version() + ' is unsupported. Please upgr= ade to at least 1.65.0') -endif -rust_args +=3D [ '--cfg', 'std_backtrace' ] # >=3D 1.65.0 -if rustc.version().version_compare('<1.81.0') - rust_args +=3D [ '--cfg', 'anyhow_no_core_error' ] -endif - -_anyhow_rs =3D static_library( - 'anyhow', - files('src/lib.rs'), - gnu_symbol_visibility: 'hidden', - override_options: ['rust_std=3D2018', 'build.rust_std=3D2018'], - rust_abi: 'rust', - rust_args: rust_args, - dependencies: [], -) - -anyhow_dep =3D declare_dependency( - link_with: _anyhow_rs, -) - -meson.override_dependency('anyhow-1-rs', anyhow_dep) diff --git a/subprojects/packagefiles/anyhow-1-rs/meson/meson.build b/subpr= ojects/packagefiles/anyhow-1-rs/meson/meson.build new file mode 100644 index 00000000000..91c46539c31 --- /dev/null +++ b/subprojects/packagefiles/anyhow-1-rs/meson/meson.build @@ -0,0 +1,9 @@ +rustc =3D meson.get_compiler('rust') + +if rustc.version().version_compare('<1.65.0') + error('rustc version ' + rustc.version() + ' is unsupported. Please upgr= ade to at least 1.65.0') +endif +extra_args +=3D [ '--cfg', 'std_backtrace' ] # >=3D 1.65.0 +if rustc.version().version_compare('<1.81.0') + extra_args +=3D [ '--cfg', 'anyhow_no_core_error' ] +endif diff --git a/subprojects/packagefiles/arbitrary-int-1-rs/meson.build b/subp= rojects/packagefiles/arbitrary-int-1-rs/meson.build deleted file mode 100644 index 00733d1faab..00000000000 --- a/subprojects/packagefiles/arbitrary-int-1-rs/meson.build +++ /dev/null @@ -1,21 +0,0 @@ -project('arbitrary-int-1-rs', 'rust', - meson_version: '>=3D1.5.0', - version: '1.2.7', - license: 'MIT', - default_options: []) - -_arbitrary_int_rs =3D static_library( - 'arbitrary_int', - files('src/lib.rs'), - gnu_symbol_visibility: 'hidden', - override_options: ['rust_std=3D2021', 'build.rust_std=3D2021'], - rust_args: ['--cap-lints', 'allow'], - rust_abi: 'rust', - dependencies: [], -) - -arbitrary_int_dep =3D declare_dependency( - link_with: _arbitrary_int_rs, -) - -meson.override_dependency('arbitrary-int-1-rs', arbitrary_int_dep) diff --git a/subprojects/packagefiles/attrs-0.2-rs/meson.build b/subproject= s/packagefiles/attrs-0.2-rs/meson.build deleted file mode 100644 index ee575476cb2..00000000000 --- a/subprojects/packagefiles/attrs-0.2-rs/meson.build +++ /dev/null @@ -1,33 +0,0 @@ -project('attrs-0.2-rs', 'rust', - meson_version: '>=3D1.5.0', - version: '0.2.9', - license: 'MIT OR Apache-2.0', - default_options: []) - -subproject('proc-macro2-1-rs', required: true) -subproject('syn-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) diff --git a/subprojects/packagefiles/bilge-0.2-rs/meson.build b/subproject= s/packagefiles/bilge-0.2-rs/meson.build deleted file mode 100644 index ce13d0fe80f..00000000000 --- a/subprojects/packagefiles/bilge-0.2-rs/meson.build +++ /dev/null @@ -1,31 +0,0 @@ -project( - 'bilge-0.2-rs', - 'rust', - meson_version: '>=3D1.5.0', - version : '0.2.0', - license : 'MIT or Apache-2.0', -) - -subproject('arbitrary-int-1-rs', required: true) -subproject('bilge-impl-0.2-rs', required: true) - -arbitrary_int_dep =3D dependency('arbitrary-int-1-rs') -bilge_impl_dep =3D dependency('bilge-impl-0.2-rs') - -lib =3D static_library( - 'bilge', - 'src/lib.rs', - override_options : ['rust_std=3D2021', 'build.rust_std=3D2021'], - rust_abi : 'rust', - rust_args: ['--cap-lints', 'allow'], - dependencies: [ - arbitrary_int_dep, - bilge_impl_dep, - ], -) - -bilge_dep =3D declare_dependency( - link_with : [lib], -) - -meson.override_dependency('bilge-0.2-rs', bilge_dep) diff --git a/subprojects/packagefiles/bilge-impl-0.2-rs/meson.build b/subpr= ojects/packagefiles/bilge-impl-0.2-rs/meson.build deleted file mode 100644 index 04617b875c5..00000000000 --- a/subprojects/packagefiles/bilge-impl-0.2-rs/meson.build +++ /dev/null @@ -1,44 +0,0 @@ -project('bilge-impl-0.2-rs', 'rust', - meson_version: '>=3D1.5.0', - version: '0.2.0', - license: 'MIT OR Apache-2.0', - default_options: []) - -subproject('itertools-0.11-rs', required: true) -subproject('proc-macro-error-attr-1-rs', required: true) -subproject('proc-macro-error-1-rs', required: true) -subproject('quote-1-rs', required: true) -subproject('syn-2-rs', required: true) -subproject('proc-macro2-1-rs', required: true) - -itertools_dep =3D dependency('itertools-0.11-rs', native: true) -proc_macro_error_attr_dep =3D dependency('proc-macro-error-attr-1-rs', nat= ive: true) -proc_macro_error_dep =3D dependency('proc-macro-error-1-rs', native: true) -quote_dep =3D dependency('quote-1-rs', native: true) -syn_dep =3D dependency('syn-2-rs', native: true) -proc_macro2_dep =3D dependency('proc-macro2-1-rs', native: true) - -rust =3D import('rust') - -_bilge_impl_rs =3D rust.proc_macro( - 'bilge_impl', - files('src/lib.rs'), - override_options: ['rust_std=3D2021', 'build.rust_std=3D2021'], - rust_args: [ - '--cap-lints', 'allow', - ], - dependencies: [ - itertools_dep, - proc_macro_error_attr_dep, - proc_macro_error_dep, - quote_dep, - syn_dep, - proc_macro2_dep, - ], -) - -bilge_impl_dep =3D declare_dependency( - link_with: _bilge_impl_rs, -) - -meson.override_dependency('bilge-impl-0.2-rs', bilge_impl_dep) diff --git a/subprojects/packagefiles/bilge-impl-0.2-rs/meson/meson.build b= /subprojects/packagefiles/bilge-impl-0.2-rs/meson/meson.build new file mode 100644 index 00000000000..d8961d602e8 --- /dev/null +++ b/subprojects/packagefiles/bilge-impl-0.2-rs/meson/meson.build @@ -0,0 +1,3 @@ +extra_args +=3D [ + '--cfg', 'use_fallback', +] diff --git a/subprojects/packagefiles/either-1-rs/meson.build b/subprojects= /packagefiles/either-1-rs/meson.build deleted file mode 100644 index 04c96cc5fb3..00000000000 --- a/subprojects/packagefiles/either-1-rs/meson.build +++ /dev/null @@ -1,26 +0,0 @@ -project('either-1-rs', 'rust', - meson_version: '>=3D1.5.0', - version: '1.12.0', - license: 'MIT OR Apache-2.0', - default_options: []) - -_either_rs =3D static_library( - 'either', - files('src/lib.rs'), - gnu_symbol_visibility: 'hidden', - override_options: ['rust_std=3D2018', 'build.rust_std=3D2018'], - rust_abi: 'rust', - rust_args: [ - '--cap-lints', 'allow', - '--cfg', 'feature=3D"use_std"', - '--cfg', 'feature=3D"use_alloc"', - ], - dependencies: [], - native: true, -) - -either_dep =3D declare_dependency( - link_with: _either_rs, -) - -meson.override_dependency('either-1-rs', either_dep, native: true) diff --git a/subprojects/packagefiles/foreign-0.3-rs/meson.build b/subproje= cts/packagefiles/foreign-0.3-rs/meson.build deleted file mode 100644 index 0901c02c527..00000000000 --- a/subprojects/packagefiles/foreign-0.3-rs/meson.build +++ /dev/null @@ -1,26 +0,0 @@ -project('foreign-0.3-rs', 'rust', - meson_version: '>=3D1.5.0', - version: '0.2.0', - license: 'MIT OR Apache-2.0', - default_options: []) - -subproject('libc-0.2-rs', required: true) -libc_rs =3D dependency('libc-0.2-rs') - -_foreign_rs =3D static_library( - 'foreign', - 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: [libc_rs], -) - -foreign_dep =3D declare_dependency( - link_with: _foreign_rs, -) - -meson.override_dependency('foreign-0.3-rs', foreign_dep) diff --git a/subprojects/packagefiles/glib-sys-0.21-rs/meson.build b/subpro= jects/packagefiles/glib-sys-0.21-rs/meson.build deleted file mode 100644 index 8c5483311ed..00000000000 --- a/subprojects/packagefiles/glib-sys-0.21-rs/meson.build +++ /dev/null @@ -1,33 +0,0 @@ -project('glib-sys-0.21-rs', 'rust', - meson_version: '>=3D1.5.0', - version: '0.21.2', - license: 'MIT', - default_options: []) - -subproject('libc-0.2-rs', required: true) -libc_rs =3D dependency('libc-0.2-rs') - -_glib_sys_rs =3D static_library( - 'glib_sys', - 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', - '--cfg', 'feature=3D"v2_66"', - '--cfg', 'feature=3D"v2_64"', - '--cfg', 'feature=3D"v2_62"', - '--cfg', 'feature=3D"v2_60"', - '--cfg', 'feature=3D"v2_58"', - ], - # should also link with glib; don't bother doing it here since all - # QEMU targets have it - dependencies: [libc_rs], -) - -glib_sys_dep =3D declare_dependency( - link_with: _glib_sys_rs, -) - -meson.override_dependency('glib-sys-0.21-rs', glib_sys_dep) diff --git a/subprojects/packagefiles/itertools-0.11-rs/meson.build b/subpr= ojects/packagefiles/itertools-0.11-rs/meson.build deleted file mode 100644 index 2a3fbe9ee5a..00000000000 --- a/subprojects/packagefiles/itertools-0.11-rs/meson.build +++ /dev/null @@ -1,32 +0,0 @@ -project('itertools-0.11-rs', 'rust', - meson_version: '>=3D1.5.0', - version: '0.11.0', - license: 'MIT OR Apache-2.0', - default_options: []) - -subproject('either-1-rs', required: true) - -either_dep =3D dependency('either-1-rs', native: true) - -_itertools_rs =3D static_library( - 'itertools', - files('src/lib.rs'), - gnu_symbol_visibility: 'hidden', - override_options: ['rust_std=3D2018', 'build.rust_std=3D2018'], - rust_abi: 'rust', - rust_args: [ - '--cap-lints', 'allow', - '--cfg', 'feature=3D"use_std"', - '--cfg', 'feature=3D"use_alloc"', - ], - dependencies: [ - either_dep, - ], - native: true, -) - -itertools_dep =3D declare_dependency( - link_with: _itertools_rs, -) - -meson.override_dependency('itertools-0.11-rs', itertools_dep, native: true) diff --git a/subprojects/packagefiles/libc-0.2-rs/meson.build b/subprojects= /packagefiles/libc-0.2-rs/meson.build deleted file mode 100644 index ac4f80dba98..00000000000 --- a/subprojects/packagefiles/libc-0.2-rs/meson.build +++ /dev/null @@ -1,37 +0,0 @@ -project('libc-0.2-rs', 'rust', - meson_version: '>=3D1.5.0', - version: '0.2.162', - license: 'MIT OR Apache-2.0', - default_options: []) - -_libc_rs =3D static_library( - 'libc', - files('src/lib.rs'), - gnu_symbol_visibility: 'hidden', - override_options: ['rust_std=3D2015', 'build.rust_std=3D2015'], - rust_abi: 'rust', - rust_args: [ - '--cap-lints', 'allow', - '--cfg', 'freebsd11', - '--cfg', 'libc_priv_mod_use', - '--cfg', 'libc_union', - '--cfg', 'libc_const_size_of', - '--cfg', 'libc_align', - '--cfg', 'libc_int128', - '--cfg', 'libc_core_cvoid', - '--cfg', 'libc_packedN', - '--cfg', 'libc_cfg_target_vendor', - '--cfg', 'libc_non_exhaustive', - '--cfg', 'libc_long_array', - '--cfg', 'libc_ptr_addr_of', - '--cfg', 'libc_underscore_const_names', - '--cfg', 'libc_const_extern_fn', - ], - dependencies: [], -) - -libc_dep =3D declare_dependency( - link_with: _libc_rs, -) - -meson.override_dependency('libc-0.2-rs', libc_dep) diff --git a/subprojects/packagefiles/libc-0.2-rs/meson/meson.build b/subpr= ojects/packagefiles/libc-0.2-rs/meson/meson.build new file mode 100644 index 00000000000..db9480ada1c --- /dev/null +++ b/subprojects/packagefiles/libc-0.2-rs/meson/meson.build @@ -0,0 +1,16 @@ +extra_args +=3D [ + '--cfg', 'freebsd11', + '--cfg', 'libc_priv_mod_use', + '--cfg', 'libc_union', + '--cfg', 'libc_const_size_of', + '--cfg', 'libc_align', + '--cfg', 'libc_int128', + '--cfg', 'libc_core_cvoid', + '--cfg', 'libc_packedN', + '--cfg', 'libc_cfg_target_vendor', + '--cfg', 'libc_non_exhaustive', + '--cfg', 'libc_long_array', + '--cfg', 'libc_ptr_addr_of', + '--cfg', 'libc_underscore_const_names', + '--cfg', 'libc_const_extern_fn', +] diff --git a/subprojects/packagefiles/proc-macro-error-1-rs/meson.build b/s= ubprojects/packagefiles/proc-macro-error-1-rs/meson.build deleted file mode 100644 index 8ba558e1330..00000000000 --- a/subprojects/packagefiles/proc-macro-error-1-rs/meson.build +++ /dev/null @@ -1,41 +0,0 @@ -project('proc-macro-error-1-rs', 'rust', - meson_version: '>=3D1.5.0', - version: '1.0.4', - license: 'MIT OR Apache-2.0', - default_options: []) - -subproject('proc-macro-error-attr-1-rs', required: true) -subproject('quote-1-rs', required: true) -subproject('syn-2-rs', required: true) -subproject('proc-macro2-1-rs', required: true) - -proc_macro_error_attr_dep =3D dependency('proc-macro-error-attr-1-rs', nat= ive: true) -proc_macro2_dep =3D dependency('proc-macro2-1-rs', native: true) -quote_dep =3D dependency('quote-1-rs', native: true) -syn_dep =3D dependency('syn-2-rs', native: true) - -_proc_macro_error_rs =3D static_library( - 'proc_macro_error', - files('src/lib.rs'), - override_options: ['rust_std=3D2018', 'build.rust_std=3D2018'], - rust_abi: 'rust', - rust_args: [ - '--cap-lints', 'allow', - '--cfg', 'use_fallback', - '--cfg', 'feature=3D"syn-error"', - '-A', 'non_fmt_panics' - ], - dependencies: [ - proc_macro_error_attr_dep, - proc_macro2_dep, - quote_dep, - syn_dep, - ], - native: true, -) - -proc_macro_error_dep =3D declare_dependency( - link_with: _proc_macro_error_rs, -) - -meson.override_dependency('proc-macro-error-1-rs', proc_macro_error_dep, n= ative: true) diff --git a/subprojects/packagefiles/proc-macro-error-1-rs/meson/meson.bui= ld b/subprojects/packagefiles/proc-macro-error-1-rs/meson/meson.build new file mode 100644 index 00000000000..52a244d2b16 --- /dev/null +++ b/subprojects/packagefiles/proc-macro-error-1-rs/meson/meson.build @@ -0,0 +1,3 @@ +extra_args =3D [ + '--cfg', 'use_fallback', +] diff --git a/subprojects/packagefiles/proc-macro-error-attr-1-rs/meson.buil= d b/subprojects/packagefiles/proc-macro-error-attr-1-rs/meson.build deleted file mode 100644 index a85d7c07143..00000000000 --- a/subprojects/packagefiles/proc-macro-error-attr-1-rs/meson.build +++ /dev/null @@ -1,31 +0,0 @@ -project('proc-macro-error-attr-1-rs', 'rust', - meson_version: '>=3D1.5.0', - version: '1.12.0', - license: 'MIT OR Apache-2.0', - default_options: []) - -subproject('proc-macro2-1-rs', required: true) -subproject('quote-1-rs', required: true) - -proc_macro2_dep =3D dependency('proc-macro2-1-rs', native: true) -quote_dep =3D dependency('quote-1-rs', native: true) - -rust =3D import('rust') -_proc_macro_error_attr_rs =3D rust.proc_macro( - 'proc_macro_error_attr', - files('src/lib.rs'), - override_options: ['rust_std=3D2018', 'build.rust_std=3D2018'], - rust_args: [ - '--cap-lints', 'allow', - ], - dependencies: [ - proc_macro2_dep, - quote_dep, - ], -) - -proc_macro_error_attr_dep =3D declare_dependency( - link_with: _proc_macro_error_attr_rs, -) - -meson.override_dependency('proc-macro-error-attr-1-rs', proc_macro_error_a= ttr_dep, native: true) diff --git a/subprojects/packagefiles/proc-macro-error-attr-1-rs/meson/meso= n.build b/subprojects/packagefiles/proc-macro-error-attr-1-rs/meson/meson.b= uild new file mode 100644 index 00000000000..a80aee2b382 --- /dev/null +++ b/subprojects/packagefiles/proc-macro-error-attr-1-rs/meson/meson.build @@ -0,0 +1,3 @@ +extra_args +=3D [ + '--cfg', 'use_fallback', +] diff --git a/subprojects/packagefiles/proc-macro2-1-rs/meson.build b/subpro= jects/packagefiles/proc-macro2-1-rs/meson.build deleted file mode 100644 index ba7de070292..00000000000 --- a/subprojects/packagefiles/proc-macro2-1-rs/meson.build +++ /dev/null @@ -1,35 +0,0 @@ -project('proc-macro2-1-rs', 'rust', - meson_version: '>=3D1.5.0', - version: '1.0.95', - license: 'MIT OR Apache-2.0', - default_options: []) - -subproject('unicode-ident-1-rs', required: true) - -unicode_ident_dep =3D dependency('unicode-ident-1-rs', native: true) - -_proc_macro2_rs =3D static_library( - 'proc_macro2', - 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', - '--cfg', 'feature=3D"proc-macro"', - '--cfg', 'no_literal_byte_character', - '--cfg', 'no_literal_c_string', - '--cfg', 'no_source_text', - '--cfg', 'wrap_proc_macro', - ], - dependencies: [ - unicode_ident_dep, - ], - native: true, -) - -proc_macro2_dep =3D declare_dependency( - link_with: _proc_macro2_rs, -) - -meson.override_dependency('proc-macro2-1-rs', proc_macro2_dep, native: tru= e) diff --git a/subprojects/packagefiles/proc-macro2-1-rs/meson/meson.build b/= subprojects/packagefiles/proc-macro2-1-rs/meson/meson.build new file mode 100644 index 00000000000..09712bb0b0e --- /dev/null +++ b/subprojects/packagefiles/proc-macro2-1-rs/meson/meson.build @@ -0,0 +1,6 @@ +extra_args =3D [ + '--cfg', 'no_literal_byte_character', + '--cfg', 'no_literal_c_string', + '--cfg', 'no_source_text', + '--cfg', 'wrap_proc_macro', +] diff --git a/subprojects/packagefiles/quote-1-rs/meson.build b/subprojects/= packagefiles/quote-1-rs/meson.build deleted file mode 100644 index bf41fad99bb..00000000000 --- a/subprojects/packagefiles/quote-1-rs/meson.build +++ /dev/null @@ -1,31 +0,0 @@ -project('quote-1-rs', 'rust', - meson_version: '>=3D1.5.0', - version: '1.12.0', - license: 'MIT OR Apache-2.0', - default_options: []) - -subproject('proc-macro2-1-rs', required: true) - -proc_macro2_dep =3D dependency('proc-macro2-1-rs', native: true) - -_quote_rs =3D static_library( - 'quote', - 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', - '--cfg', 'feature=3D"proc-macro"', - ], - dependencies: [ - proc_macro2_dep, - ], - native: true, -) - -quote_dep =3D declare_dependency( - link_with: _quote_rs, -) - -meson.override_dependency('quote-1-rs', quote_dep, native: true) diff --git a/subprojects/packagefiles/serde-1-rs/meson.build b/subprojects/= packagefiles/serde-1-rs/meson.build deleted file mode 100644 index 775e0120f24..00000000000 --- a/subprojects/packagefiles/serde-1-rs/meson.build +++ /dev/null @@ -1,36 +0,0 @@ -project('serde-1-rs', 'rust', - meson_version: '>=3D1.5.0', - version: '1.0.226', - license: 'MIT OR Apache-2.0', - default_options: []) - -subproject('serde_core-1-rs', required: true) -subproject('serde_derive-1-rs', required: true) - -serde_core_dep =3D dependency('serde_core-1-rs') -serde_derive_dep =3D dependency('serde_derive-1-rs') - -_serde_rs =3D static_library( - 'serde', - 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', - '--cfg', 'feature=3D"alloc"', - '--cfg', 'feature=3D"std"', - '--cfg', 'feature=3D"derive"', - ], - dependencies: [ - serde_core_dep, - serde_derive_dep, - ] -) - -serde_dep =3D declare_dependency( - link_with: _serde_rs, - dependencies: serde_derive_dep, -) - -meson.override_dependency('serde-1-rs', serde_dep) diff --git a/subprojects/packagefiles/serde_core-1-rs/meson.build b/subproj= ects/packagefiles/serde_core-1-rs/meson.build deleted file mode 100644 index 79c36f6b70e..00000000000 --- a/subprojects/packagefiles/serde_core-1-rs/meson.build +++ /dev/null @@ -1,25 +0,0 @@ -project('serde_core-1-rs', 'rust', - meson_version: '>=3D1.5.0', - version: '1.0.226', - license: 'MIT OR Apache-2.0', - default_options: []) - -_serde_core_rs =3D static_library( - 'serde_core', - 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', - '--cfg', 'feature=3D"alloc"', - '--cfg', 'feature=3D"result"', - '--cfg', 'feature=3D"std"', - ], -) - -serde_core_dep =3D declare_dependency( - link_with: _serde_core_rs, -) - -meson.override_dependency('serde_core-1-rs', serde_core_dep) diff --git a/subprojects/packagefiles/serde_core-1-rs/private.rs.in b/subpr= ojects/packagefiles/serde_core-1-rs/private.rs.in new file mode 100644 index 00000000000..2f8155c2a80 --- /dev/null +++ b/subprojects/packagefiles/serde_core-1-rs/private.rs.in @@ -0,0 +1,6 @@ +#[doc(hidden)] +pub mod __private@CARGO_PKG_VERSION_PATCH@ { + #[doc(hidden)] + pub use crate::private::*; +} + diff --git a/subprojects/packagefiles/serde_derive-1-rs/meson.build b/subpr= ojects/packagefiles/serde_derive-1-rs/meson.build deleted file mode 100644 index 6c1001a844a..00000000000 --- a/subprojects/packagefiles/serde_derive-1-rs/meson.build +++ /dev/null @@ -1,35 +0,0 @@ -project('serde_derive-1-rs', 'rust', - meson_version: '>=3D1.5.0', - version: '1.0.226', - license: 'MIT OR Apache-2.0', - default_options: []) - -subproject('quote-1-rs', required: true) -subproject('syn-2-rs', required: true) -subproject('proc-macro2-1-rs', required: true) - -quote_dep =3D dependency('quote-1-rs', native: true) -syn_dep =3D dependency('syn-2-rs', native: true) -proc_macro2_dep =3D dependency('proc-macro2-1-rs', native: true) - -rust =3D import('rust') - -_serde_derive_rs =3D rust.proc_macro( - 'serde_derive', - files('src/lib.rs'), - override_options: ['rust_std=3D2021', 'build.rust_std=3D2021'], - rust_args: [ - '--cap-lints', 'allow', - ], - dependencies: [ - quote_dep, - syn_dep, - proc_macro2_dep, - ], -) - -serde_derive_dep =3D declare_dependency( - link_with: _serde_derive_rs, -) - -meson.override_dependency('serde_derive-1-rs', serde_derive_dep) diff --git a/subprojects/packagefiles/syn-2-rs/meson.build b/subprojects/pa= ckagefiles/syn-2-rs/meson.build deleted file mode 100644 index 3e6dc318a9c..00000000000 --- a/subprojects/packagefiles/syn-2-rs/meson.build +++ /dev/null @@ -1,43 +0,0 @@ -project('syn-2-rs', 'rust', - meson_version: '>=3D1.5.0', - version: '2.0.104', - license: 'MIT OR Apache-2.0', - default_options: []) - -subproject('proc-macro2-1-rs', required: true) -subproject('quote-1-rs', required: true) -subproject('unicode-ident-1-rs', required: true) - -proc_macro2_dep =3D dependency('proc-macro2-1-rs', native: true) -quote_dep =3D dependency('quote-1-rs', native: true) -unicode_ident_dep =3D dependency('unicode-ident-1-rs', native: true) - -_syn_rs =3D static_library( - 'syn', - 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', - '--cfg', 'feature=3D"full"', - '--cfg', 'feature=3D"derive"', - '--cfg', 'feature=3D"parsing"', - '--cfg', 'feature=3D"printing"', - '--cfg', 'feature=3D"clone-impls"', - '--cfg', 'feature=3D"proc-macro"', - '--cfg', 'feature=3D"extra-traits"', - ], - dependencies: [ - quote_dep, - proc_macro2_dep, - unicode_ident_dep, - ], - native: true, -) - -syn_dep =3D declare_dependency( - link_with: _syn_rs, -) - -meson.override_dependency('syn-2-rs', syn_dep, native: true) diff --git a/subprojects/packagefiles/unicode-ident-1-rs/meson.build b/subp= rojects/packagefiles/unicode-ident-1-rs/meson.build deleted file mode 100644 index 11a5dab97df..00000000000 --- a/subprojects/packagefiles/unicode-ident-1-rs/meson.build +++ /dev/null @@ -1,22 +0,0 @@ -project('unicode-ident-1-rs', 'rust', - meson_version: '>=3D1.5.0', - version: '1.0.12', - license: '(MIT OR Apache-2.0) AND Unicode-DFS-2016', - default_options: []) - -_unicode_ident_rs =3D static_library( - 'unicode_ident', - 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: [], - native: true, -) - -unicode_ident_dep =3D declare_dependency( - link_with: _unicode_ident_rs, -) - -meson.override_dependency('unicode-ident-1-rs', unicode_ident_dep, native:= true) diff --git a/subprojects/probe-0.5-rs.wrap b/subprojects/probe-0.5-rs.wrap index bd23c0ea789..035da86c46a 100644 --- a/subprojects/probe-0.5-rs.wrap +++ b/subprojects/probe-0.5-rs.wrap @@ -4,7 +4,6 @@ source_url =3D https://crates.io/api/v1/crates/probe/0.5.2/= download source_filename =3D probe-0.5.2.tar.gz source_hash =3D 136558b6e1ebaecc92755d0ffaf9421f519531bed30cc2ad23b22cb009= 65cc5e method =3D cargo -patch_directory =3D probe-0.5-rs =20 # bump this version number on every change to meson.build or the patches: # v1 diff --git a/subprojects/quote-1-rs.wrap b/subprojects/quote-1-rs.wrap index dab58490a4f..80d5ea84f54 100644 --- a/subprojects/quote-1-rs.wrap +++ b/subprojects/quote-1-rs.wrap @@ -4,7 +4,6 @@ source_url =3D https://crates.io/api/v1/crates/quote/1.0.36= /download source_filename =3D quote-1.0.36.0.tar.gz source_hash =3D 0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208= acaca7 method =3D cargo -patch_directory =3D quote-1-rs =20 # bump this version number on every change to meson.build or the patches: # v3 diff --git a/subprojects/serde-1-rs.wrap b/subprojects/serde-1-rs.wrap index 9792592d480..801f11efd1f 100644 --- a/subprojects/serde-1-rs.wrap +++ b/subprojects/serde-1-rs.wrap @@ -5,7 +5,6 @@ source_filename =3D serde-1.0.226.0.tar.gz source_hash =3D 0dca6411025b24b60bfa7ec1fe1f8e710ac09782dca409ee8237ba74b5= 1295fd method =3D cargo diff_files =3D serde-1.0.226-include.patch -patch_directory =3D serde-1-rs =20 # bump this version number on every change to meson.build or the patches: # v2 diff --git a/subprojects/serde_core-1-rs.wrap b/subprojects/serde_core-1-rs= .wrap index ff2e59430b1..6c2919871e1 100644 --- a/subprojects/serde_core-1-rs.wrap +++ b/subprojects/serde_core-1-rs.wrap @@ -5,7 +5,6 @@ source_filename =3D serde_core-1.0.226.0.tar.gz source_hash =3D ba2ba63999edb9dac981fb34b3e5c0d111a69b0924e253ed29d83f7c99= e966a4 method =3D cargo diff_files =3D serde_core-1.0.226-include.patch -patch_directory =3D serde_core-1-rs =20 # bump this version number on every change to meson.build or the patches: # v2 diff --git a/subprojects/serde_derive-1-rs.wrap b/subprojects/serde_derive-= 1-rs.wrap index ed345a7f840..9fb96c5e336 100644 --- a/subprojects/serde_derive-1-rs.wrap +++ b/subprojects/serde_derive-1-rs.wrap @@ -5,7 +5,6 @@ source_filename =3D serde_derive-1.0.226.0.tar.gz source_hash =3D 8db53ae22f34573731bafa1db20f04027b2d25e02d8205921b56917169= 9cdb33 method =3D cargo diff_files =3D serde_derive-1.0.226-include.patch -patch_directory =3D serde_derive-1-rs =20 # bump this version number on every change to meson.build or the patches: # v2 diff --git a/subprojects/syn-2-rs.wrap b/subprojects/syn-2-rs.wrap index 4b545c7980c..8ec7fd00528 100644 --- a/subprojects/syn-2-rs.wrap +++ b/subprojects/syn-2-rs.wrap @@ -4,7 +4,6 @@ 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 # bump this version number on every change to meson.build or the patches: # v3 diff --git a/subprojects/unicode-ident-1-rs.wrap b/subprojects/unicode-iden= t-1-rs.wrap index 0a5e097953e..0495b3912f1 100644 --- a/subprojects/unicode-ident-1-rs.wrap +++ b/subprojects/unicode-ident-1-rs.wrap @@ -4,7 +4,6 @@ source_url =3D https://crates.io/api/v1/crates/unicode-iden= t/1.0.12/download source_filename =3D unicode-ident-1.0.12.tar.gz source_hash =3D 3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec= 0fee4b method =3D cargo -patch_directory =3D unicode-ident-1-rs =20 # bump this version number on every change to meson.build or the patches: # v3 --=20 2.54.0 From nobody Sat May 30 17:44:37 2026 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=1779787605; cv=none; d=zohomail.com; s=zohoarc; b=CRTCHzygx0C5ZrYTo8OTCKi7F+qML/upg5yWvRfIBR9FnSdtGDwKauSlUsTvO2O6NfzWoCfi75aOSig8D9Yn8+k4tJ0wbbRum5lHduCzlz89rfAj6+0LLHQGqDDFwHEjiPz4bGdQgVBT7TkuMvCy+0X8TvIg66BdYOjk75NOcnw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779787605; h=Content-Transfer-Encoding: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:Cc; bh=BJdd8Uk7qdZMe9AyVwH8JOZ00EnKc7MDR2nSV5VJWtk=; b=JigQA45VjrWl2jT2PpjdKqFNqjpAIWFbeLl/XMBwLdY7Mf1u5oNXsM0sSg2/1rt8Po/MOshtvCWwngMGLH6m8fYpbD3P+pgYTMiBTtSX9lKtSs041tri52OKvD+d0neajGi+dZE8olOwm8OJpGo2P98PpEwDi0PDKcNYW2MRdrI= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 177978760530064.32694515526862; Tue, 26 May 2026 02:26:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRo32-0007LI-Hs; Tue, 26 May 2026 05:26:04 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRo31-0007KX-29 for qemu-devel@nongnu.org; Tue, 26 May 2026 05:26:03 -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 1wRo2y-00071F-6l for qemu-devel@nongnu.org; Tue, 26 May 2026 05:26:02 -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-687-vEvNHPt6PdKcxoRI47T4BA-1; Tue, 26 May 2026 05:25:57 -0400 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-49047e9ca88so31178625e9.3 for ; Tue, 26 May 2026 02:25:57 -0700 (PDT) Received: from [192.168.10.48] ([151.49.251.208]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49049973b71sm90641285e9.29.2026.05.26.02.25.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 02:25:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779787559; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=BJdd8Uk7qdZMe9AyVwH8JOZ00EnKc7MDR2nSV5VJWtk=; b=RTdsulMST5Oz8AyK8StUKS6f2sJxyYA1+86yvc+ZHw3vaLRQnVvuNFHpBmNyKIAUaGi0Kg 7zIy7pesgDNNt3670EDUgChF+30+VvSae7ilL28WH2kLkcGYrsXslwAsqPae9kngJ/2pLH L2851C24Czp0v91IJM6s0HSitqau/J0= X-MC-Unique: vEvNHPt6PdKcxoRI47T4BA-1 X-Mimecast-MFC-AGG-ID: vEvNHPt6PdKcxoRI47T4BA_1779787556 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1779787556; x=1780392356; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=BJdd8Uk7qdZMe9AyVwH8JOZ00EnKc7MDR2nSV5VJWtk=; b=g+e2mopeIkb1ScHDLL+xCDVawYF/llLCLXcOytfp9JRSfGeyq6SUyI6FFPvAnghDcU JIVnulWFjpwHcTcaIbnHVTh7gga1/eYkDA7MhyOBHQPUC+/k6itze3O2WOP9b+8JJX8f qLcaHm5uwIhXldMWryFsiGpw2E5aPvicyUEEMnGVb8pZpJXqCqXYDNT6JmR2iw+mPkai K6IKDo0EJaSPvmqpz0G6Z8rGlOXLZ6MFcWIPmIldytefLvBkx6T6o+4fuhR/XURUWeSw O8SkJGX6NqzOEkqtgcNmlUPEVcHsX2cdPqO9YKEO5/SMxgIM2Fbf2zRekICSPpXnaF1j cueQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779787556; x=1780392356; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=BJdd8Uk7qdZMe9AyVwH8JOZ00EnKc7MDR2nSV5VJWtk=; b=l3veJiuNe+mUjKHwNWm218L2VOZowNjzYK7LKrxDLEGF9cDZ6S4WIk8lo9fadxbNm0 PaYbB9kvZRSFtLV4yIEepM5sX8qnr+4XbYc2tB2t/HCqWGk50vEwo+sXoOtetP4u7NNB XtwVMTiX01zUCpofPc1Be62/3lgSnIdj19XDWkZfPpsDEhyhw4bcbrn/hPBSQMP5IIRX ejIOW6B4b16HsEygqP+4SWrI2rhdomlbhUxSTz4qWhaGFD/FLqLkyasFLnh884IF3QBU 8cGfCkL8DrgSFj0SFUf3UHnzR0bxLRZJjpWTo3Bu8IqZONcXId/Kcvo1NVNwQ3ZGTcxt Lo0g== X-Gm-Message-State: AOJu0Ywz0W86qip9Qn9UPnDrOyUmSHL1+9BgkzC/VVH8dmTcDZbX3/lS 36RfyBw3Ru2mBE1yq4WqOIItEX4HjS5o731ZnXmaN5kaDxlBATgqgrnMutiv8v0JZuUmbEMvXsj f165BEkHbJvbTDWAZSfFM19tine7feRMAuUli7olN4tvKk+t0d+MXJTNfKS+PTnUmZwXBDdfmpT 1/6zu49nVqhdgKcRQ2W1XL2xhj4n/+Y0QXC71oRQAn X-Gm-Gg: Acq92OFjIOC+XhGf2dyy5y0xU9I0k5HDqdbQKpqmVZ4hC1raR/MTGSgDNzQ9DjjBfzi U4y1X/vX+G3U7ZotCmh2DaZCVBxPsmMxf1ikdDq5m+FxETm01lDnIHQ/Ah1BRVE4w6GysQ3GMRi /h8hvt8lFbfjrrYbAMPih4nWgGk0vaUJ/aIqV8wueCYfHb34XSbPalUEKPB6LaIOh1XknYOZMns xlHOfa35EXheX6DCgZkNkLkzMcewFLM1LXSPlyWiy2kuDYiMCGcRkijp91DzyZD2xp5qNS3zQBv u4Bvia6VUrv2Yh95a+AfydfChHVX+tm/LG8ERmvUQlImBR5kmlsyrPHn0d6XSrp/tDnK/MaiYIL PIU+5qSmgTKlXTPbrfChO+2dtXSl//98BZuHM5HKxTjSi7t+zekMVLsCpVSPTZ6pvI/uSCl+6Ef Cc8XWiMdiooNxWkJB775AEO2SME8c= X-Received: by 2002:a05:600c:8b08:b0:490:601f:d785 with SMTP id 5b1f17b1804b1-490601fd90amr159406225e9.2.1779787555980; Tue, 26 May 2026 02:25:55 -0700 (PDT) X-Received: by 2002:a05:600c:8b08:b0:490:601f:d785 with SMTP id 5b1f17b1804b1-490601fd90amr159405525e9.2.1779787555335; Tue, 26 May 2026 02:25:55 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 4/6] rust: remove unnecessary wrap files Date: Tue, 26 May 2026 11:25:43 +0200 Message-ID: <20260526092546.149241-5-pbonzini@redhat.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260526092546.149241-1-pbonzini@redhat.com> References: <20260526092546.149241-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=lists1p.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: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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_H4=0.001, RCVD_IN_MSPIKE_WL=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: qemu development 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: 1779787606329158500 Content-Type: text/plain; charset="utf-8" Meson can also figure out what the content of the wrap file would be, at least if there is no diff file. So delete the now-unnecessary wrap configurations. Signed-off-by: Paolo Bonzini --- subprojects/anyhow-1-rs.wrap | 10 ---------- subprojects/arbitrary-int-1-rs.wrap | 9 --------- subprojects/attrs-0.2-rs.wrap | 9 --------- subprojects/bilge-0.2-rs.wrap | 9 --------- subprojects/bilge-impl-0.2-rs.wrap | 10 ---------- subprojects/either-1-rs.wrap | 9 --------- subprojects/foreign-0.3-rs.wrap | 9 --------- subprojects/glib-sys-0.21-rs.wrap | 9 --------- subprojects/itertools-0.11-rs.wrap | 9 --------- subprojects/libc-0.2-rs.wrap | 7 ------- subprojects/probe-0.5-rs.wrap | 9 --------- subprojects/proc-macro-error-1-rs.wrap | 10 ---------- subprojects/proc-macro-error-attr-1-rs.wrap | 10 ---------- subprojects/proc-macro2-1-rs.wrap | 10 ---------- subprojects/quote-1-rs.wrap | 9 --------- subprojects/syn-2-rs.wrap | 9 --------- subprojects/unicode-ident-1-rs.wrap | 9 --------- 17 files changed, 156 deletions(-) delete mode 100644 subprojects/anyhow-1-rs.wrap delete mode 100644 subprojects/arbitrary-int-1-rs.wrap delete mode 100644 subprojects/attrs-0.2-rs.wrap delete mode 100644 subprojects/bilge-0.2-rs.wrap delete mode 100644 subprojects/bilge-impl-0.2-rs.wrap delete mode 100644 subprojects/either-1-rs.wrap delete mode 100644 subprojects/foreign-0.3-rs.wrap delete mode 100644 subprojects/glib-sys-0.21-rs.wrap delete mode 100644 subprojects/itertools-0.11-rs.wrap delete mode 100644 subprojects/libc-0.2-rs.wrap delete mode 100644 subprojects/probe-0.5-rs.wrap delete mode 100644 subprojects/proc-macro-error-1-rs.wrap delete mode 100644 subprojects/proc-macro-error-attr-1-rs.wrap delete mode 100644 subprojects/proc-macro2-1-rs.wrap delete mode 100644 subprojects/quote-1-rs.wrap delete mode 100644 subprojects/syn-2-rs.wrap delete mode 100644 subprojects/unicode-ident-1-rs.wrap diff --git a/subprojects/anyhow-1-rs.wrap b/subprojects/anyhow-1-rs.wrap deleted file mode 100644 index 132c70c467e..00000000000 --- a/subprojects/anyhow-1-rs.wrap +++ /dev/null @@ -1,10 +0,0 @@ -[wrap-file] -directory =3D anyhow-1.0.98 -source_url =3D https://crates.io/api/v1/crates/anyhow/1.0.98/download -source_filename =3D anyhow-1.0.98.tar.gz -source_hash =3D e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969b= dcd487 -method =3D cargo -patch_directory =3D anyhow-1-rs - -# bump this version number on every change to meson.build or the patches: -# v2 diff --git a/subprojects/arbitrary-int-1-rs.wrap b/subprojects/arbitrary-in= t-1-rs.wrap deleted file mode 100644 index 5cf4b11e4a3..00000000000 --- a/subprojects/arbitrary-int-1-rs.wrap +++ /dev/null @@ -1,9 +0,0 @@ -[wrap-file] -directory =3D arbitrary-int-1.2.7 -source_url =3D https://crates.io/api/v1/crates/arbitrary-int/1.2.7/download -source_filename =3D arbitrary-int-1.2.7.tar.gz -source_hash =3D c84fc003e338a6f69fbd4f7fe9f92b535ff13e9af8997f3b14b6ddff8b= 1df46d -method =3D cargo - -# bump this version number on every change to meson.build or the patches: -# v2 diff --git a/subprojects/attrs-0.2-rs.wrap b/subprojects/attrs-0.2-rs.wrap deleted file mode 100644 index dcdddf005f6..00000000000 --- a/subprojects/attrs-0.2-rs.wrap +++ /dev/null @@ -1,9 +0,0 @@ -[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 - -# bump this version number on every change to meson.build or the patches: -# v2 diff --git a/subprojects/bilge-0.2-rs.wrap b/subprojects/bilge-0.2-rs.wrap deleted file mode 100644 index cff10f6710d..00000000000 --- a/subprojects/bilge-0.2-rs.wrap +++ /dev/null @@ -1,9 +0,0 @@ -[wrap-file] -directory =3D bilge-0.2.0 -source_url =3D https://crates.io/api/v1/crates/bilge/0.2.0/download -source_filename =3D bilge-0.2.0.tar.gz -source_hash =3D dc707ed8ebf81de5cd6c7f48f54b4c8621760926cdf35a57000747c512= e67b57 -method =3D cargo - -# bump this version number on every change to meson.build or the patches: -# v2 diff --git a/subprojects/bilge-impl-0.2-rs.wrap b/subprojects/bilge-impl-0.= 2-rs.wrap deleted file mode 100644 index e423b6cec66..00000000000 --- a/subprojects/bilge-impl-0.2-rs.wrap +++ /dev/null @@ -1,10 +0,0 @@ -[wrap-file] -directory =3D bilge-impl-0.2.0 -source_url =3D https://crates.io/api/v1/crates/bilge-impl/0.2.0/download -source_filename =3D bilge-impl-0.2.0.tar.gz -source_hash =3D feb11e002038ad243af39c2068c8a72bcf147acf05025dcdb916fcc000= adb2d8 -method =3D cargo -patch_directory =3D bilge-impl-0.2-rs - -# bump this version number on every change to meson.build or the patches: -# v3 diff --git a/subprojects/either-1-rs.wrap b/subprojects/either-1-rs.wrap deleted file mode 100644 index d2808d3d7fb..00000000000 --- a/subprojects/either-1-rs.wrap +++ /dev/null @@ -1,9 +0,0 @@ -[wrap-file] -directory =3D either-1.12.0 -source_url =3D https://crates.io/api/v1/crates/either/1.12.0/download -source_filename =3D either-1.12.0.tar.gz -source_hash =3D 3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb233= 85b58b -method =3D cargo - -# bump this version number on every change to meson.build or the patches: -# v3 diff --git a/subprojects/foreign-0.3-rs.wrap b/subprojects/foreign-0.3-rs.w= rap deleted file mode 100644 index e4aa7f11fc0..00000000000 --- a/subprojects/foreign-0.3-rs.wrap +++ /dev/null @@ -1,9 +0,0 @@ -[wrap-file] -directory =3D foreign-0.3.1 -source_url =3D https://crates.io/api/v1/crates/foreign/0.3.1/download -source_filename =3D foreign-0.3.1.tar.gz -source_hash =3D 17ca1b5be8c9d320daf386f1809c7acc0cb09accbae795c2001953fa50= 585846 -method =3D cargo - -# bump this version number on every change to meson.build or the patches: -# v2 diff --git a/subprojects/glib-sys-0.21-rs.wrap b/subprojects/glib-sys-0.21-= rs.wrap deleted file mode 100644 index 4723f7f63be..00000000000 --- a/subprojects/glib-sys-0.21-rs.wrap +++ /dev/null @@ -1,9 +0,0 @@ -[wrap-file] -directory =3D glib-sys-0.21.2 -source_url =3D https://crates.io/api/v1/crates/glib-sys/0.21.2/download -source_filename =3D glib-sys-0.21.2.tar.gz -source_hash =3D d09d3d0fddf7239521674e57b0465dfbd844632fec54f059f7f56112e3= f927e1 -method =3D cargo - -# bump this version number on every change to meson.build or the patches: -# v2 diff --git a/subprojects/itertools-0.11-rs.wrap b/subprojects/itertools-0.1= 1-rs.wrap deleted file mode 100644 index fc63e2f57d9..00000000000 --- a/subprojects/itertools-0.11-rs.wrap +++ /dev/null @@ -1,9 +0,0 @@ -[wrap-file] -directory =3D itertools-0.11.0 -source_url =3D https://crates.io/api/v1/crates/itertools/0.11.0/download -source_filename =3D itertools-0.11.0.tar.gz -source_hash =3D b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418= c3fe57 -method =3D cargo - -# bump this version number on every change to meson.build or the patches: -# v3 diff --git a/subprojects/libc-0.2-rs.wrap b/subprojects/libc-0.2-rs.wrap deleted file mode 100644 index 488330178ed..00000000000 --- a/subprojects/libc-0.2-rs.wrap +++ /dev/null @@ -1,7 +0,0 @@ -[wrap-file] -directory =3D libc-0.2.162 -source_url =3D https://crates.io/api/v1/crates/libc/0.2.162/download -source_filename =3D libc-0.2.162.tar.gz -source_hash =3D 18d287de67fe55fd7e1581fe933d965a5a9477b38e949cfa9f8574ef01= 506398 -method =3D cargo -patch_directory =3D libc-0.2-rs diff --git a/subprojects/probe-0.5-rs.wrap b/subprojects/probe-0.5-rs.wrap deleted file mode 100644 index 035da86c46a..00000000000 --- a/subprojects/probe-0.5-rs.wrap +++ /dev/null @@ -1,9 +0,0 @@ -[wrap-file] -directory =3D probe-0.5.2 -source_url =3D https://crates.io/api/v1/crates/probe/0.5.2/download -source_filename =3D probe-0.5.2.tar.gz -source_hash =3D 136558b6e1ebaecc92755d0ffaf9421f519531bed30cc2ad23b22cb009= 65cc5e -method =3D cargo - -# bump this version number on every change to meson.build or the patches: -# v1 diff --git a/subprojects/proc-macro-error-1-rs.wrap b/subprojects/proc-macr= o-error-1-rs.wrap deleted file mode 100644 index e57921bfadc..00000000000 --- a/subprojects/proc-macro-error-1-rs.wrap +++ /dev/null @@ -1,10 +0,0 @@ -[wrap-file] -directory =3D proc-macro-error-1.0.4 -source_url =3D https://crates.io/api/v1/crates/proc-macro-error/1.0.4/down= load -source_filename =3D proc-macro-error-1.0.4.tar.gz -source_hash =3D da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a= 5ce38c -method =3D cargo -patch_directory =3D proc-macro-error-1-rs - -# bump this version number on every change to meson.build or the patches: -# v3 diff --git a/subprojects/proc-macro-error-attr-1-rs.wrap b/subprojects/proc= -macro-error-attr-1-rs.wrap deleted file mode 100644 index 02d18f3393d..00000000000 --- a/subprojects/proc-macro-error-attr-1-rs.wrap +++ /dev/null @@ -1,10 +0,0 @@ -[wrap-file] -directory =3D proc-macro-error-attr-1.0.4 -source_url =3D https://crates.io/api/v1/crates/proc-macro-error-attr/1.0.4= /download -source_filename =3D proc-macro-error-attr-1.0.4.tar.gz -source_hash =3D a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b= 35f869 -method =3D cargo -patch_directory =3D proc-macro-error-attr-1-rs - -# bump this version number on every change to meson.build or the patches: -# v3 diff --git a/subprojects/proc-macro2-1-rs.wrap b/subprojects/proc-macro2-1-= rs.wrap deleted file mode 100644 index 676d1a3a8ca..00000000000 --- a/subprojects/proc-macro2-1-rs.wrap +++ /dev/null @@ -1,10 +0,0 @@ -[wrap-file] -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 - -# bump this version number on every change to meson.build or the patches: -# v3 diff --git a/subprojects/quote-1-rs.wrap b/subprojects/quote-1-rs.wrap deleted file mode 100644 index 80d5ea84f54..00000000000 --- a/subprojects/quote-1-rs.wrap +++ /dev/null @@ -1,9 +0,0 @@ -[wrap-file] -directory =3D quote-1.0.36 -source_url =3D https://crates.io/api/v1/crates/quote/1.0.36/download -source_filename =3D quote-1.0.36.0.tar.gz -source_hash =3D 0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208= acaca7 -method =3D cargo - -# bump this version number on every change to meson.build or the patches: -# v3 diff --git a/subprojects/syn-2-rs.wrap b/subprojects/syn-2-rs.wrap deleted file mode 100644 index 8ec7fd00528..00000000000 --- a/subprojects/syn-2-rs.wrap +++ /dev/null @@ -1,9 +0,0 @@ -[wrap-file] -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 - -# bump this version number on every change to meson.build or the patches: -# v3 diff --git a/subprojects/unicode-ident-1-rs.wrap b/subprojects/unicode-iden= t-1-rs.wrap deleted file mode 100644 index 0495b3912f1..00000000000 --- a/subprojects/unicode-ident-1-rs.wrap +++ /dev/null @@ -1,9 +0,0 @@ -[wrap-file] -directory =3D unicode-ident-1.0.12 -source_url =3D https://crates.io/api/v1/crates/unicode-ident/1.0.12/downlo= ad -source_filename =3D unicode-ident-1.0.12.tar.gz -source_hash =3D 3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec= 0fee4b -method =3D cargo - -# bump this version number on every change to meson.build or the patches: -# v3 --=20 2.54.0 From nobody Sat May 30 17:44:37 2026 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=1779787599; cv=none; d=zohomail.com; s=zohoarc; b=Enpm+K5PeYfyX7stSqIaFYdM338IJWFJm+xoPVHAJdX0w406CUtnDrqGbnZQ8pAloKG4qDb3Ti5qbpB9+VMLClHcSYwVJnAqiU3tTXEstckszF+teUlpY+lrTOwuEaV1o3QYtedxTl9Ol17VmDPw33py/lGxxMUNLR9NomYbjjA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779787599; h=Content-Transfer-Encoding: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:Cc; bh=TY8mlBhBGEKNFGowfTH7/khG7dYr2XbHpJdlPwV+L9c=; b=WGSsm+WuOykYGAaIrnP/SwKxecvmRu+4O90DHJMe3gCDP8Lw3xK+6sZiartZ79BoDNaHlmr9PTbrQpom8XZJSuyb17LjVGL2iLwVNnNoOt6N6/qdP+x9gLHEzLGvz1g77S8HZzKdV7olT6Jg8ltQNzILVfF0KOjRZYJXEhUrFrg= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 177978759922287.97105824400353; Tue, 26 May 2026 02:26:39 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRo37-0007O1-OQ; Tue, 26 May 2026 05:26:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRo34-0007Lh-BF for qemu-devel@nongnu.org; Tue, 26 May 2026 05:26:06 -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 1wRo2z-00073q-Oo for qemu-devel@nongnu.org; Tue, 26 May 2026 05:26:05 -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-240-dCPm2O9SOk6Q58gVof5g3A-1; Tue, 26 May 2026 05:25:59 -0400 Received: by mail-wr1-f69.google.com with SMTP id ffacd0b85a97d-4411a2c034fso9499587f8f.3 for ; Tue, 26 May 2026 02:25:59 -0700 (PDT) Received: from [192.168.10.48] ([151.49.251.208]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6c9de2dsm32643768f8f.4.2026.05.26.02.25.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 02:25:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779787561; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=TY8mlBhBGEKNFGowfTH7/khG7dYr2XbHpJdlPwV+L9c=; b=O98IGbbbNEJfzH77yAZO7AnFtOWwrYnSOiVn+nLz1oqeEqNDJYjxjRDwtnx6EEtnXgAo5R H/p7l1Mz1SCSyQ0W7rFrrYNJVzxnE7OL1pjLPVCond7XpSrfJQseNSD3BQQdPiqZsLCeC+ lyFWKewH6EhGPjGknO0vIGRyOmdm9hE= X-MC-Unique: dCPm2O9SOk6Q58gVof5g3A-1 X-Mimecast-MFC-AGG-ID: dCPm2O9SOk6Q58gVof5g3A_1779787558 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1779787558; x=1780392358; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=TY8mlBhBGEKNFGowfTH7/khG7dYr2XbHpJdlPwV+L9c=; b=Tb7ln1tS0n5+PN72y1R0QNsTLsJ2q3F2dEQxN5eMopSCqBANLPnwGNjZpEyJcDS6Bj GQSitGeCwA/cZvWFpSu4y1euqbiF1V6ooZzPzIerQGKk1njk/5ASDb8spG+aaeqOKysO /SGGb49fAEx3yOMx2a0I6zqUeS2olBgqDEM/1g4RU9mIoWX/JyuQKjf06dbEZ19e/iIH KqRXVDJNozmnbNvixI/zng/tW42q/iDsSJWvqhE5zWb/zcOF0YfyDueG/EKmMZWojkU+ B7cwJS0BKwViumDJqo6WSL/en7O8dTOkdixNYPwRGPPKEUd9AWtzanC1HKeZs6P2x/y+ 7aCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779787558; x=1780392358; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=TY8mlBhBGEKNFGowfTH7/khG7dYr2XbHpJdlPwV+L9c=; b=WHBA01dQXH0gUiHlxnJUxTvQ5HxQ4l0e8cVJ/zmrRjv8M7qeGzmx0gyLg2qnrifCuo 1Tc1Yv6S+rZaWJA3LC0Yhs8e6OHeRrrgV9DpVXWP4qIrlN4aDt74obVzBPReoH6fYFLq edEt9hhLFKezDbInnhPUszjEGFc3w6Mn2xv1bxnKjcAgw/G4l3YA4DuH+r+xxYq3thJD OiWZhBkhhTpxFAmSKrKUvgomXIgiR3Wyat5wAT/nQgYu08rjckF7ytO8VsJmO1MBFrmI JI4yGSMT2G9vIJUDqqF77OhgJB034HUsPjByARbXhDpYM2DQ4/3YSSnDyaWp+1ozczoe CPTQ== X-Gm-Message-State: AOJu0YzSiyjbIw6mU8uMHmBcZbTyORbR+O1RUbaky0HOqPgKfHy6YkW0 wr5I2vu63i9ImBIyCd4zZk9YSqp+d2VAJoCWXXgYs3YOBNrO+JayMsfgOQR5tlUR/vY4D0GUmmf 0/7xTNVRzIMqJMpH84f4AtlSS2QPyLDMf8SYj0ocL+UHQFjhscm4BRCRiIwJCV7JjuRenrJiqa0 dGzi3obXYZ1rNlCO1n29RpnP+fau4lrN/YTYJCDBEc X-Gm-Gg: Acq92OHDwNU95nBqlS6GNlmtRIIMur6zYCfcViraemPLuSnlJ0KJaDxHBTdplz+1WLo NJqFqd3u6xGzjaBiCthWO++P8Rj5HuOKetMq35AQszoReTk9M5XrSXgCuHgPHhPNOWowBVhl9ph KsVd35Pr/kMWW9FmM+rlSZ049M6yAmdoNE8EywjOEf/tD9WAvBuptKCqjoZ6XML+RqVD/kX1WBT hxK0U1b7NO0d+lw4VooxPkImly/Cb5FR8vocSopwKKkxknJ4gQsxEYt+kk6oMVZeHU5ydoVKzOK 0o7MgHDYA5ETPWK8QJ9ng7US2c09gKjEj452P2J1dk23lNfY+xOJ4jkLK0jiDaTRZ6kOzl+GmIh XcW1yx5FBNS9CtJK5VjJoMVN9X+Db4X3Sx1mV1rFLESSBhXCArmIItlEgbAwO8Af+IeW7lpi6fR W2jGlwQXv8o1y6lVYQ2aLHSDOinFc= X-Received: by 2002:a05:600c:1553:b0:490:58ef:cea7 with SMTP id 5b1f17b1804b1-49058efcf6amr197894225e9.22.1779787557821; Tue, 26 May 2026 02:25:57 -0700 (PDT) X-Received: by 2002:a05:600c:1553:b0:490:58ef:cea7 with SMTP id 5b1f17b1804b1-49058efcf6amr197893245e9.22.1779787557013; Tue, 26 May 2026 02:25:57 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 5/6] rust: use meson automatic parsing of Cargo.toml Date: Tue, 26 May 2026 11:25:44 +0200 Message-ID: <20260526092546.149241-6-pbonzini@redhat.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260526092546.149241-1-pbonzini@redhat.com> References: <20260526092546.149241-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=lists1p.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: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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, 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: qemu development 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: 1779787600793158501 Content-Type: text/plain; charset="utf-8" Finally, automatic parsing of Cargo.toml is also possible for QEMU's own crates, not just for subprojects. This removes the need to list the dependencies and language editions in both Cargo.toml and meson.build files. Signed-off-by: Paolo Bonzini --- meson.build | 7 +------ rust/bindings/chardev-sys/meson.build | 11 ++++------- rust/bindings/hwcore-sys/meson.build | 11 ++++------- rust/bindings/migration-sys/meson.build | 11 ++++------- rust/bindings/qom-sys/meson.build | 11 ++++------- rust/bindings/system-sys/meson.build | 11 ++++------- rust/bindings/util-sys/meson.build | 11 ++++------- rust/bits/meson.build | 7 ++----- rust/bql/meson.build | 13 +++---------- rust/chardev/meson.build | 8 ++------ rust/common/meson.build | 10 +++------- rust/hw/char/pl011/meson.build | 22 +--------------------- rust/hw/core/meson.build | 10 ++-------- rust/hw/timer/hpet/meson.build | 17 +---------------- rust/meson.build | 13 ++----------- rust/migration/meson.build | 8 ++------ rust/qemu-macros/meson.build | 12 ++---------- rust/qom/meson.build | 8 ++------ rust/system/meson.build | 8 ++------ rust/trace/meson.build | 9 +++------ rust/util/meson.build | 7 ++----- 21 files changed, 54 insertions(+), 171 deletions(-) diff --git a/meson.build b/meson.build index 91d74fa198c..17c8751f92d 100644 --- a/meson.build +++ b/meson.build @@ -134,12 +134,7 @@ if have_rust =20 rustfmt =3D find_program('rustfmt', required: false) =20 - rustc_lint_args =3D run_command(rustc_args, '--lints', - capture: true, check: true).stdout().strip().splitlines() - if get_option('strict_rust_lints') - rustc_lint_args +=3D ['-Dwarnings', '-Funknown_lints'] - endif - + rustc_lint_args =3D get_option('strict_rust_lints') ? ['-Dwarnings', '-= Funknown_lints'] : [] add_project_arguments(rustc_lint_args + ['--cfg', 'MESON'], native: false, language: 'rust') add_project_arguments(rustc_lint_args + ['--cfg', 'MESON'], diff --git a/rust/bindings/chardev-sys/meson.build b/rust/bindings/chardev-= sys/meson.build index 458075b8060..7af5d74dd51 100644 --- a/rust/bindings/chardev-sys/meson.build +++ b/rust/bindings/chardev-sys/meson.build @@ -1,12 +1,9 @@ _bindgen_chardev_rs =3D rust.bindgen( args: bindgen_args_common + bindgen_args_data['chardev-sys'].split(), kwargs: bindgen_kwargs) -_chardev_sys_rs =3D static_library( - 'chardev_sys', - structured_sources(['lib.rs', _bindgen_chardev_rs]), - override_options: ['rust_std=3D2021', 'build.rust_std=3D2021'], - rust_abi: 'rust', - dependencies: [glib_sys_rs, common_rs, qom_sys_rs, util_sys_rs], -) + +_chardev_sys_rs =3D cargo_ws.package('chardev-sys').library( + structured_sources(['lib.rs', _bindgen_chardev_rs])) +cargo_ws.package('chardev-sys').override_dependency(declare_dependency(lin= k_with: _chardev_sys_rs)) =20 chardev_sys_rs =3D declare_dependency(link_with: [_chardev_sys_rs]) diff --git a/rust/bindings/hwcore-sys/meson.build b/rust/bindings/hwcore-sy= s/meson.build index 3d51947b4a4..6b8d218f691 100644 --- a/rust/bindings/hwcore-sys/meson.build +++ b/rust/bindings/hwcore-sys/meson.build @@ -1,12 +1,9 @@ _bindgen_hwcore_rs =3D rust.bindgen( args: bindgen_args_common + bindgen_args_data['hwcore-sys'].split(), kwargs: bindgen_kwargs) -_hwcore_sys_rs =3D static_library( - 'hwcore_sys', - structured_sources(['lib.rs', _bindgen_hwcore_rs]), - override_options: ['rust_std=3D2021', 'build.rust_std=3D2021'], - rust_abi: 'rust', - dependencies: [common_rs, glib_sys_rs, qom_sys_rs, util_sys_rs, migratio= n_sys_rs, chardev_sys_rs], -) + +_hwcore_sys_rs =3D cargo_ws.package('hwcore-sys').library( + structured_sources(['lib.rs', _bindgen_hwcore_rs])) +cargo_ws.package('hwcore-sys').override_dependency(declare_dependency(link= _with: _hwcore_sys_rs)) =20 hwcore_sys_rs =3D declare_dependency(link_with: [_hwcore_sys_rs]) diff --git a/rust/bindings/migration-sys/meson.build b/rust/bindings/migrat= ion-sys/meson.build index 9243acba300..91f2967c9b3 100644 --- a/rust/bindings/migration-sys/meson.build +++ b/rust/bindings/migration-sys/meson.build @@ -1,12 +1,9 @@ _bindgen_migration_rs =3D rust.bindgen( args: bindgen_args_common + bindgen_args_data['migration-sys'].split(), kwargs: bindgen_kwargs) -_migration_sys_rs =3D static_library( - 'migration_sys', - structured_sources(['lib.rs', _bindgen_migration_rs]), - override_options: ['rust_std=3D2021', 'build.rust_std=3D2021'], - rust_abi: 'rust', - dependencies: [glib_sys_rs, common_rs, util_sys_rs], -) + +_migration_sys_rs =3D cargo_ws.package('migration-sys').library( + structured_sources(['lib.rs', _bindgen_migration_rs])) +cargo_ws.package('migration-sys').override_dependency(declare_dependency(l= ink_with: _migration_sys_rs)) =20 migration_sys_rs =3D declare_dependency(link_with: [_migration_sys_rs]) diff --git a/rust/bindings/qom-sys/meson.build b/rust/bindings/qom-sys/meso= n.build index 8f8ae7d1bc8..540e55eea88 100644 --- a/rust/bindings/qom-sys/meson.build +++ b/rust/bindings/qom-sys/meson.build @@ -1,12 +1,9 @@ _bindgen_qom_rs =3D rust.bindgen( args: bindgen_args_common + bindgen_args_data['qom-sys'].split(), kwargs: bindgen_kwargs) -_qom_sys_rs =3D static_library( - 'qom_sys', - structured_sources(['lib.rs', _bindgen_qom_rs]), - override_options: ['rust_std=3D2021', 'build.rust_std=3D2021'], - rust_abi: 'rust', - dependencies: [glib_sys_rs, util_sys_rs], -) + +_qom_sys_rs =3D cargo_ws.package('qom-sys').library( + structured_sources(['lib.rs', _bindgen_qom_rs])) +cargo_ws.package('qom-sys').override_dependency(declare_dependency(link_wi= th: _qom_sys_rs)) =20 qom_sys_rs =3D declare_dependency(link_with: [_qom_sys_rs]) diff --git a/rust/bindings/system-sys/meson.build b/rust/bindings/system-sy= s/meson.build index aa5e8801149..b1f4770499c 100644 --- a/rust/bindings/system-sys/meson.build +++ b/rust/bindings/system-sys/meson.build @@ -1,12 +1,9 @@ _bindgen_system_rs =3D rust.bindgen( args: bindgen_args_common + bindgen_args_data['system-sys'].split(), kwargs: bindgen_kwargs) -_system_sys_rs =3D static_library( - 'system_sys', - structured_sources(['lib.rs', _bindgen_system_rs]), - override_options: ['rust_std=3D2021', 'build.rust_std=3D2021'], - rust_abi: 'rust', - dependencies: [common_rs, glib_sys_rs, hwcore_sys_rs, migration_sys_rs, = qom_sys_rs, util_sys_rs], -) + +_system_sys_rs =3D cargo_ws.package('system-sys').library( + structured_sources(['lib.rs', _bindgen_system_rs])) +cargo_ws.package('system-sys').override_dependency(declare_dependency(link= _with: _system_sys_rs)) =20 system_sys_rs =3D declare_dependency(link_with: [_system_sys_rs]) diff --git a/rust/bindings/util-sys/meson.build b/rust/bindings/util-sys/me= son.build index c37f50a94bd..5a9db6152e1 100644 --- a/rust/bindings/util-sys/meson.build +++ b/rust/bindings/util-sys/meson.build @@ -1,12 +1,9 @@ _bindgen_util_rs =3D rust.bindgen( args: bindgen_args_common + bindgen_args_data['util-sys'].split(), kwargs: bindgen_kwargs) -_util_sys_rs =3D static_library( - 'util_sys', - structured_sources(['lib.rs', _bindgen_util_rs]), - override_options: ['rust_std=3D2021', 'build.rust_std=3D2021'], - rust_abi: 'rust', - dependencies: [glib_sys_rs], -) + +_util_sys_rs =3D cargo_ws.package('util-sys').library( + structured_sources(['lib.rs', _bindgen_util_rs])) +cargo_ws.package('util-sys').override_dependency(declare_dependency(link_w= ith: _util_sys_rs)) =20 util_sys_rs =3D declare_dependency(link_with: [_util_sys_rs]) diff --git a/rust/bits/meson.build b/rust/bits/meson.build index c0094ffcf38..c64a17ba154 100644 --- a/rust/bits/meson.build +++ b/rust/bits/meson.build @@ -1,8 +1,5 @@ -_bits_rs =3D static_library( - 'bits', - 'src/lib.rs', - dependencies: [qemu_macros], -) +_bits_rs =3D cargo_ws.package('bits').library() +cargo_ws.package('bits').override_dependency(declare_dependency(link_with:= _bits_rs)) =20 bits_rs =3D declare_dependency(link_with: _bits_rs) =20 diff --git a/rust/bql/meson.build b/rust/bql/meson.build index de295d2983e..8bdc9b53a2c 100644 --- a/rust/bql/meson.build +++ b/rust/bql/meson.build @@ -1,17 +1,10 @@ -_bql_cfg =3D run_command(rustc_args, - '--config-headers', config_host_h, '--features', files('Cargo.toml'), - capture: true, check: true).stdout().strip().splitlines() - +_bql_cfg =3D [] if get_option('debug_mutex') _bql_cfg +=3D ['--cfg', 'feature=3D"debug_cell"'] endif =20 -_bql_rs =3D static_library( - 'bql', - 'src/lib.rs', - rust_args: _bql_cfg, - dependencies: [glib_sys_rs, util_sys_rs], -) +_bql_rs =3D cargo_ws.package('bql').library(rust_args: _bql_cfg) +cargo_ws.package('bql').override_dependency(declare_dependency(link_with: = _bql_rs)) =20 bql_rs =3D declare_dependency(link_with: [_bql_rs], dependencies: [qemuutil]) diff --git a/rust/chardev/meson.build b/rust/chardev/meson.build index 7b267fd23ae..f3462e9209e 100644 --- a/rust/chardev/meson.build +++ b/rust/chardev/meson.build @@ -1,8 +1,4 @@ -_chardev_rs =3D static_library( - 'chardev', - 'src/lib.rs', - link_with: [_bql_rs, _migration_rs, _qom_rs, _util_rs], - dependencies: [glib_sys_rs, common_rs, qemu_macros, chardev_sys_rs], -) +_chardev_rs =3D cargo_ws.package('chardev').library() +cargo_ws.package('chardev').override_dependency(declare_dependency(link_wi= th: _chardev_rs)) =20 chardev_rs =3D declare_dependency(link_with: [_chardev_rs], dependencies: = [chardev, qemuutil]) diff --git a/rust/common/meson.build b/rust/common/meson.build index 57091b18fc4..43afe417dcd 100644 --- a/rust/common/meson.build +++ b/rust/common/meson.build @@ -1,13 +1,9 @@ _common_cfg =3D run_command(rustc_args, - '--config-headers', config_host_h, '--features', files('Cargo.toml'), + '--config-headers', config_host_h, files('Cargo.toml'), capture: true, check: true).stdout().strip().splitlines() =20 -_common_rs =3D static_library( - 'common', - 'src/lib.rs', - rust_args: _common_cfg, - dependencies: [libc_rs, qemu_macros], -) +_common_rs =3D cargo_ws.package('common').library(rust_args: _common_cfg) +cargo_ws.package('common').override_dependency(declare_dependency(link_wit= h: _common_rs)) =20 common_rs =3D declare_dependency(link_with: [_common_rs]) =20 diff --git a/rust/hw/char/pl011/meson.build b/rust/hw/char/pl011/meson.build index 1a1a09e5083..92b7d375f75 100644 --- a/rust/hw/char/pl011/meson.build +++ b/rust/hw/char/pl011/meson.build @@ -8,8 +8,7 @@ _libpl011_bindings_inc_rs =3D rust.bindgen( kwargs: bindgen_kwargs, ) =20 -_libpl011_rs =3D static_library( - 'pl011', +_libpl011_rs =3D cargo_ws.package('pl011').library( structured_sources( [ 'src/lib.rs', @@ -19,25 +18,6 @@ _libpl011_rs =3D static_library( ], {'.' : _libpl011_bindings_inc_rs}, ), - override_options: ['rust_std=3D2021', 'build.rust_std=3D2021'], - rust_abi: 'rust', - link_with: [ - _util_rs, - _migration_rs, - _bql_rs, - _qom_rs, - _chardev_rs, - _system_rs, - _hwcore_rs, - _trace_rs - ], - dependencies: [ - bilge_rs, - bilge_impl_rs, - bits_rs, - common_rs, - glib_sys_rs, - ], ) =20 rust_devices_ss.add(when: 'CONFIG_X_PL011_RUST', if_true: [declare_depende= ncy( diff --git a/rust/hw/core/meson.build b/rust/hw/core/meson.build index 6d1bfd4d204..da0f13d3149 100644 --- a/rust/hw/core/meson.build +++ b/rust/hw/core/meson.build @@ -1,11 +1,5 @@ -_hwcore_rs =3D static_library( - 'hwcore', - 'src/lib.rs', - override_options: ['rust_std=3D2021', 'build.rust_std=3D2021'], - rust_abi: 'rust', - link_with: [_bql_rs, _chardev_rs, _migration_rs, _qom_rs, _util_rs], - dependencies: [glib_sys_rs, qemu_macros, common_rs, hwcore_sys_rs], -) +_hwcore_rs =3D cargo_ws.package('hwcore').library() +cargo_ws.package('hwcore').override_dependency(declare_dependency(link_wit= h: _hwcore_rs)) =20 hwcore_rs =3D declare_dependency(link_with: [_hwcore_rs], dependencies: [qom_rs, hwcore]) diff --git a/rust/hw/timer/hpet/meson.build b/rust/hw/timer/hpet/meson.build index 3bb7ce2a6ca..419e8f40b70 100644 --- a/rust/hw/timer/hpet/meson.build +++ b/rust/hw/timer/hpet/meson.build @@ -1,19 +1,4 @@ -_libhpet_rs =3D static_library( - 'hpet', - files('src/lib.rs'), - override_options: ['rust_std=3D2021', 'build.rust_std=3D2021'], - rust_abi: 'rust', - link_with: [ - _util_rs, - _migration_rs, - _bql_rs, - _qom_rs, - _system_rs, - _hwcore_rs, - _trace_rs, - ], - dependencies: [common_rs], -) +_libhpet_rs =3D cargo_ws.package('hpet').library() =20 rust_devices_ss.add(when: 'CONFIG_X_HPET_RUST', if_true: [declare_dependen= cy( link_whole: [_libhpet_rs], diff --git a/rust/meson.build b/rust/meson.build index d580c7cbeef..266c2add358 100644 --- a/rust/meson.build +++ b/rust/meson.build @@ -5,19 +5,10 @@ else endif =20 cargo_ws =3D import('rust').workspace() -anyhow_rs =3D cargo_ws.subproject('anyhow').dependency() -bilge_rs =3D cargo_ws.subproject('bilge').dependency() -bilge_impl_rs =3D cargo_ws.subproject('bilge-impl').dependency() -foreign_rs =3D cargo_ws.subproject('foreign').dependency() -glib_sys_rs =3D cargo_ws.subproject('glib-sys').dependency() -libc_rs =3D cargo_ws.subproject('libc').dependency() -probe_rs =3D cargo_ws.subproject('probe').dependency() + +# used by QAPI tests, which are still not handled via cargo_ws serde_rs =3D cargo_ws.subproject('serde').dependency() serde_derive_rs =3D cargo_ws.subproject('serde_derive').dependency() -quote_rs_native =3D cargo_ws.subproject('quote').dependency() -syn_rs_native =3D cargo_ws.subproject('syn').dependency() -proc_macro2_rs_native =3D cargo_ws.subproject('proc-macro2').dependency() -attrs_rs_native =3D cargo_ws.subproject('attrs').dependency() =20 genrs =3D [] =20 diff --git a/rust/migration/meson.build b/rust/migration/meson.build index 96266897770..b9ba82989e3 100644 --- a/rust/migration/meson.build +++ b/rust/migration/meson.build @@ -1,9 +1,5 @@ -_migration_rs =3D static_library( - 'migration', - 'src/lib.rs', - link_with: [_util_rs, _bql_rs], - dependencies: [common_rs, glib_sys_rs, qemu_macros, migration_sys_rs], -) +_migration_rs =3D cargo_ws.package('migration').library() +cargo_ws.package('migration').override_dependency(declare_dependency(link_= with: _migration_rs)) =20 migration_rs =3D declare_dependency(link_with: [_migration_rs], dependencies: [bql_rs, migration, qemuutil]) diff --git a/rust/qemu-macros/meson.build b/rust/qemu-macros/meson.build index cdea5bf439e..7b25ccefe35 100644 --- a/rust/qemu-macros/meson.build +++ b/rust/qemu-macros/meson.build @@ -1,13 +1,5 @@ -_qemu_macros_rs =3D rust.proc_macro( - 'qemu_macros', - files('src/lib.rs'), - dependencies: [ - attrs_rs_native, - proc_macro2_rs_native, - quote_rs_native, - syn_rs_native, - ], -) +_qemu_macros_rs =3D cargo_ws.package('qemu_macros').proc_macro() +cargo_ws.package('qemu_macros').override_dependency(declare_dependency(lin= k_with: _qemu_macros_rs)) =20 qemu_macros =3D declare_dependency( link_with: _qemu_macros_rs, diff --git a/rust/qom/meson.build b/rust/qom/meson.build index 9865da280cf..6736cfb24c2 100644 --- a/rust/qom/meson.build +++ b/rust/qom/meson.build @@ -1,9 +1,5 @@ -_qom_rs =3D static_library( - 'qom', - 'src/lib.rs', - link_with: [_bql_rs, _migration_rs], - dependencies: [common_rs, glib_sys_rs, qemu_macros, qom_sys_rs], -) +_qom_rs =3D cargo_ws.package('qom').library() +cargo_ws.package('qom').override_dependency(declare_dependency(link_with: = _qom_rs)) =20 qom_rs =3D declare_dependency(link_with: [_qom_rs], dependencies: [qemu_ma= cros, qom, qemuutil]) =20 diff --git a/rust/system/meson.build b/rust/system/meson.build index 89c1f2b84d1..b1edcd6bbe7 100644 --- a/rust/system/meson.build +++ b/rust/system/meson.build @@ -1,9 +1,5 @@ -_system_rs =3D static_library( - 'system', - 'src/lib.rs', - link_with: [_bql_rs, _hwcore_rs, _migration_rs, _qom_rs, _util_rs], - dependencies: [glib_sys_rs, common_rs, qemu_macros, system_sys_rs], -) +_system_rs =3D cargo_ws.package('system').library() +cargo_ws.package('system').override_dependency(declare_dependency(link_wit= h: _system_rs)) =20 system_rs =3D declare_dependency(link_with: [_system_rs], dependencies: [hwcore]) diff --git a/rust/trace/meson.build b/rust/trace/meson.build index 0071a49cf72..b049f73b542 100644 --- a/rust/trace/meson.build +++ b/rust/trace/meson.build @@ -7,11 +7,8 @@ lib_rs =3D configure_file( 'MESON_BUILD_ROOT': meson.project_build_root(), }) =20 -_trace_rs =3D static_library( - 'trace', # Library name, - lib_rs, - trace_rs_targets, # List of generated `.rs` custom targets - dependencies: [libc_rs, probe_rs], -) +_trace_rs =3D cargo_ws.package('trace').library( + structured_sources([lib_rs, trace_rs_targets])) +cargo_ws.package('trace').override_dependency(declare_dependency(link_with= : _trace_rs)) =20 trace_rs =3D declare_dependency(link_with: _trace_rs) diff --git a/rust/util/meson.build b/rust/util/meson.build index 3edd8245bfc..427427f1915 100644 --- a/rust/util/meson.build +++ b/rust/util/meson.build @@ -1,8 +1,5 @@ -_util_rs =3D static_library( - 'util', - 'src/lib.rs', - dependencies: [anyhow_rs, libc_rs, foreign_rs, glib_sys_rs, common_rs, s= erde_rs, util_sys_rs], -) +_util_rs =3D cargo_ws.package('util').library() +cargo_ws.package('util').override_dependency(declare_dependency(link_with:= _util_rs)) =20 util_rs =3D declare_dependency(link_with: [_util_rs], dependencies: [qemuu= til, qom]) =20 --=20 2.54.0 From nobody Sat May 30 17:44:37 2026 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=1779787609; cv=none; d=zohomail.com; s=zohoarc; b=GLtxMlhzQTc7/XWWEGR6U9QWhqhi1qLUKklltZHX0JnQLOd5SLmvhjepAdCn40P5V429ZafGLtzzAxtG7PU1yqdHS8hVASEjDwrJE1+PYcxQZywj+1/V81RW56HX327mvM9iYMHN1bavzGGQZ25/mi4j4Ca9epqFBEug8VRdr1A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1779787609; h=Content-Transfer-Encoding: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:Cc; bh=gULj+k4BCCh2uG0UeEN9zuYScGXHWT7MpOumSH23u6Y=; b=FZFE2V+9Bho8ZAEslxHtw9zzkf39ap5K5ByqgRnRmtXkqt0cyQtEfFYClfyT2m7IP8zO98Hvn9v1FzfeO7aZkDwsd2zS+Xtjo2Sxw0MyvPdtt/FZvpIp49eVFCgUeqqM64hytcDL0Dm6T+u45H1xOrJz53gs43S/I/h3jTB6LRs= 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 lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1779787608938561.5593444832505; Tue, 26 May 2026 02:26:48 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wRo36-0007MH-JA; Tue, 26 May 2026 05:26:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wRo34-0007Li-BG for qemu-devel@nongnu.org; Tue, 26 May 2026 05:26:06 -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 1wRo32-00075S-3W for qemu-devel@nongnu.org; Tue, 26 May 2026 05:26:05 -0400 Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com [209.85.221.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-258-92Ev3DWEMXW0WI54AjkRdw-1; Tue, 26 May 2026 05:26:01 -0400 Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-45ea38c03a1so4313239f8f.1 for ; Tue, 26 May 2026 02:26:01 -0700 (PDT) Received: from [192.168.10.48] ([151.49.251.208]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-45eb6c9f598sm34664694f8f.6.2026.05.26.02.25.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 May 2026 02:25:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1779787563; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gULj+k4BCCh2uG0UeEN9zuYScGXHWT7MpOumSH23u6Y=; b=M6gzWZbKADOtz3ts2lSMBMu6XtUZO3iYk8WNP1fDbJ7URwlyoWblicRTBoSYvutc9Jk/s/ d7Ut1+xFITej3gFoAOOBvKA+co9MLRoEYbwyPsiwW+6OmJk6ESHDEb7zWnmBsyRHiyzCA4 9BpfhihvgzZxpXY98HXdw+UQ/VdOceg= X-MC-Unique: 92Ev3DWEMXW0WI54AjkRdw-1 X-Mimecast-MFC-AGG-ID: 92Ev3DWEMXW0WI54AjkRdw_1779787560 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1779787560; x=1780392360; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=gULj+k4BCCh2uG0UeEN9zuYScGXHWT7MpOumSH23u6Y=; b=iX4XUtVlJUQiNJLgFzSOoAjRTA2eOwpzKaIHYcbxIw4Jr4SaXFPlp9nxWY0x+uxGPN AlFf8Dm1WM2ovEb/5BMnMwV6zVzGhH53taUkd5dX1exOSbybtPz9wTjmFA/jIFaAOXBg 0kUAjOoEPzk45yOI39n84L3ua5V9S25zjRXmtDqcVdipuO7+EDGLg/EV9UtLixM6CCmB 9zC9N09oNPq2FK5/6u4fZekg+9SKoUKAA2Lmd5X5EHapKSnKcZORLnxvRg+xcxQ/numK OcDEJsWZNiLEn/keyYylUXYWndTrGYOYVw1SAg+uIykre4ktW2abTklJF5ccQ9LkD165 bv5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1779787560; x=1780392360; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=gULj+k4BCCh2uG0UeEN9zuYScGXHWT7MpOumSH23u6Y=; b=HuMZBKQcQTZDgeXShGlNCKVLWGMDdsS9agMKwwYkery32ZzklpGmrWMS07vmlFSD2V L0mpoRbkBS/Ge9kMNbxnqEl+Y8mdoW9EDcjIJ/I1wr/QGuj4HNzhvf8L5joabJ2TzVlp zWkVVcC9NjghiSU2hXxQ14zOGm8vR0ASP0/ue+wvUMVh7EE27ymc9pILEknLRYVB7qr7 cpWgms734vGIFGdEpNNCEyzaiyD9SOK/+DlcpiSNo8D5Y2MX8oaLTwydD1zjaCGMMB6n EM3RQ1QouuCAM5464OM3Ra3yE3hqR7aB10bErWUXRsOkSXhcZwwX+h5A/frVubnrA3s6 /C4Q== X-Gm-Message-State: AOJu0YzNe0igtP8+eO0hFliSUXD0BAHBGDKwv9xkNlpZ/t1A6YedEWpn E0arKpKJQqk0CIusifhYMJ7ill6ds64NLJsX6xwnbiDNALpVUAf4DU4OgxnfryIQ51xef4ZOD41 K/uBXFmGv3vBiYoowsJUflK7HgclXzPWmf5iMgvgEb4i9NbzBapWrmL9KZ4CtsUu3tvpqmb3Wml KR7S5KT0HoDYke8jJDjjbLI/Nqh59gkCWb3JDgzBeQ X-Gm-Gg: Acq92OFBx+p6kE1Qbg1wSrb/SJ7ab7zHMTeROoclQWs2UbshhtPSxY7F2C4cJbkHhGY 2blXYhiBFRC+fqI0YLexqv7R2Xii+cGLzLD7PafiTdKXIDojQvl+mzLX3FbRe249E3vY0Y97t+b tKTqSroZ6fPDzDtJE7GLyfSrABkV8ymeexSuo0yIywnMpf7w5AOh0S5gmcSS0mXSzg8xKBxmW5L lKifSV144uxMKguKOmY7D7+l4kkGWDIvkFbJYblHuOCH5Ite+QWKcjpKMHqUPTcP+4kCVA9FfGk rGt2VZD26BhdI5jDQ+SJyug7juLk7AAwRJxu7nFczGY4ulT4LlxIRM2uN9pjFCF+RMANDADw7hm 333415ppMFVhN1uLsYBmYVC+zdoqMKcSJGfBoPWh+Ood12odtDIO9fOoArS4vvBcMGKAeeymgVT z5/xHm0r6h9nv15ZmyH9ynPF8EGAvB4iqJBYDzrg== X-Received: by 2002:a05:6000:1a85:b0:43d:762e:76ba with SMTP id ffacd0b85a97d-45eb367fb35mr29644110f8f.17.1779787560250; Tue, 26 May 2026 02:26:00 -0700 (PDT) X-Received: by 2002:a05:6000:1a85:b0:43d:762e:76ba with SMTP id ffacd0b85a97d-45eb367fb35mr29644053f8f.17.1779787559707; Tue, 26 May 2026 02:25:59 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Subject: [PATCH 6/6] scripts: remove now dead parts of rustc_args.py Date: Tue, 26 May 2026 11:25:45 +0200 Message-ID: <20260526092546.149241-7-pbonzini@redhat.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260526092546.149241-1-pbonzini@redhat.com> References: <20260526092546.149241-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=lists1p.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: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.445, 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, 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: qemu development 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: 1779787610384158500 Content-Type: text/plain; charset="utf-8" The logic to parse the [lints] section has been integrated into Meson and can be removed. Signed-off-by: Paolo Bonzini --- meson.build | 1 - scripts/rust/rustc_args.py | 80 +------------------------------------- 2 files changed, 1 insertion(+), 80 deletions(-) diff --git a/meson.build b/meson.build index 17c8751f92d..999350a8b50 100644 --- a/meson.build +++ b/meson.build @@ -129,7 +129,6 @@ endif =20 if have_rust rustc_args =3D [find_program('scripts/rust/rustc_args.py'), - '--rustc-version', rustc.version(), '--workspace', meson.project_source_root()] =20 rustfmt =3D find_program('rustfmt', required: false) diff --git a/scripts/rust/rustc_args.py b/scripts/rust/rustc_args.py index 6a156b9608e..7229676bcc8 100644 --- a/scripts/rust/rustc_args.py +++ b/scripts/rust/rustc_args.py @@ -25,10 +25,9 @@ """ =20 import argparse -from dataclasses import dataclass import logging from pathlib import Path -from typing import Any, Iterable, List, Mapping, Optional, Set +from typing import Any, Iterable, Mapping, Optional, Set =20 try: import tomllib @@ -74,40 +73,6 @@ def get_table(self, key: str, can_be_workspace: bool =3D= False) -> Mapping[Any, An return table =20 =20 -@dataclass -class LintFlag: - flags: List[str] - priority: int - - -def generate_lint_flags(cargo_toml: CargoTOML) -> Iterable[str]: - """Converts Cargo.toml lints to rustc -A/-D/-F/-W flags.""" - - toml_lints =3D cargo_toml.lints - - lint_list =3D [] - for k, v in toml_lints.items(): - prefix =3D "" if k =3D=3D "rust" else k + "::" - for lint, data in v.items(): - level =3D data if isinstance(data, str) else data["level"] - priority =3D 0 if isinstance(data, str) else data.get("priorit= y", 0) - if level =3D=3D "deny": - flag =3D "-D" - elif level =3D=3D "allow": - flag =3D "-A" - elif level =3D=3D "warn": - flag =3D "-W" - elif level =3D=3D "forbid": - flag =3D "-F" - else: - raise Exception(f"invalid level {level} for {prefix}{lint}= ") - lint_list.append(LintFlag(flags=3D[flag, prefix + lint], prior= ity=3Dpriority)) - - lint_list.sort(key=3Dlambda x: x.priority) - for lint in lint_list: - yield from lint.flags - - def generate_cfg_flags(header: str, cargo_toml: Optional[CargoTOML]) -> It= erable[str]: """Converts defines from config[..].h headers to rustc --cfg flags.""" =20 @@ -155,31 +120,6 @@ def main() -> None: required=3DFalse, default=3DNone, ) - parser.add_argument( - "--features", - action=3D"store_true", - dest=3D"features", - help=3D"generate --check-cfg arguments for features", - required=3DFalse, - default=3DNone, - ) - parser.add_argument( - "--lints", - action=3D"store_true", - dest=3D"lints", - help=3D"generate arguments from [lints] table", - required=3DFalse, - default=3DNone, - ) - parser.add_argument( - "--rustc-version", - metavar=3D"VERSION", - dest=3D"rustc_version", - action=3D"store", - help=3D"version of rustc", - required=3DFalse, - default=3D"1.0.0", - ) parser.add_argument( "--no-strict-cfg", help=3D"only generate expected cfg", @@ -192,30 +132,12 @@ def main() -> None: logging.basicConfig(level=3Dlogging.DEBUG) logging.debug("args: %s", args) =20 - rustc_version =3D tuple((int(x) for x in args.rustc_version.split('.')= [0:2])) if args.workspace: workspace_cargo_toml =3D Path(args.workspace, "Cargo.toml").resolv= e() cargo_toml =3D CargoTOML(args.cargo_toml, str(workspace_cargo_toml= )) else: cargo_toml =3D CargoTOML(args.cargo_toml, None) =20 - if args.lints: - for tok in generate_lint_flags(cargo_toml): - print(tok) - - if rustc_version >=3D (1, 80): - if args.lints: - print("--check-cfg") - print("cfg(test)") - for cfg in sorted(cargo_toml.check_cfg): - print("--check-cfg") - print(cfg) - if args.features: - for feature in cargo_toml.get_table("features"): - if feature !=3D "default": - print("--check-cfg") - print(f'cfg(feature,values("{feature}"))') - for header in args.config_headers: for tok in generate_cfg_flags(header, cargo_toml if args.strict_cf= g else None): print(tok) --=20 2.54.0