From patchwork Wed Jan 29 08:37:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 13953529 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id BB22BC02192 for ; Wed, 29 Jan 2025 08:38:03 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1td3ZW-0002w9-CM; Wed, 29 Jan 2025 03:37:18 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1td3ZU-0002vS-Q0 for qemu-devel@nongnu.org; Wed, 29 Jan 2025 03:37:16 -0500 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 1td3ZS-0006W7-VP for qemu-devel@nongnu.org; Wed, 29 Jan 2025 03:37:16 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1738139834; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Lf4c6h56xYCNge6XjLmVtzeXRglB5fuipR2Vwz8DQLs=; b=WVBnblaqC7lpB4cIsEmUk7tBZ+GB3Z13M6A+fPhAsXrP1MleeueR5zXAM36pCQUQI8+xZb w7uc363qegaroJwqhpSqrDnolIjX3K/QdGyH4vrXO8rmsyf9rikymkbPoWQIRIAr5GtpnS oJtFqBzxRSe4wJP6s6UfTVnDsYK6tUY= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-172-x4iOQCzmMr2rPIdUWZNZuQ-1; Wed, 29 Jan 2025 03:37:12 -0500 X-MC-Unique: x4iOQCzmMr2rPIdUWZNZuQ-1 X-Mimecast-MFC-AGG-ID: x4iOQCzmMr2rPIdUWZNZuQ Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-43646b453bcso33133105e9.3 for ; Wed, 29 Jan 2025 00:37:12 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738139830; x=1738744630; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Lf4c6h56xYCNge6XjLmVtzeXRglB5fuipR2Vwz8DQLs=; b=SJP1CVbCI6oonscTSpeycXT+H+OVndKjgiuhEBvpSqhwDpLpRbcqZoCOcA6yYEp/dP s5TRZD0vKUzBHgVW+Ax+iZrJVU8/vpFcZj4UbqDo3RzVSzXzuoZMf0IatzOxM/z+gzMF nd9/5iFsWP1Yx9ZaLYkLkvYTlDIRmcVVeUjWNfBHYti4NYnjV4sT4Ob+cDqiT7wq94PO rYg+mNMX+qCRAQ87cAZAsJbO9rrtCH9tvZd6xdqlZfzEr7MYRwhZD9hAirrXc5Z73PjF ZN6JJ9k8dhCqnRUry6bJAdXJ/4phGXFrbvbcRcwIbUGJ3PWyLdLOcWejc7A1j+QmC5mH HgkQ== X-Gm-Message-State: AOJu0YwEQ+i0RP45fVGgc10TCmLVl1Vx3XRTRbC0+zfJDkI+xSG4dLEW Kl/0T6FNV1ULyg5gDEFFDRut9Lpa5wVwT1xWUC8rig82XisoC3ypMVPsvyvzAa4kzPNNL5k8Ri4 Gz/uUl1ytM/00B43GKTyv/u5Ta48+OQTAhM6cDZIJVl8ddew/9aIPx691UYkLDMspXO5MKOfEpT HjHFUgbswCgh66GICGZK62G8N5BfDJ7iVWh13ZONc= X-Gm-Gg: ASbGnctQNwziSqz+W34gtZT9FkCNLw/tSx/WRz484zugTvVotKcyKWAQBbJl+Wl7ydu dVkk+sNfUQ1XTiUhUkpsS1ec721JwfABxj2hB17WwGnj//oN1gf8WfDVnROwb9h0bhvIl5HWrA8 qxtTucimQkPAB8+yGB/E4aRQpXHTyknVmLZ71uCHotLlz5LlQjFIhvPxKdDkwvbzvX9oqnl9JPl g66WH7sVR6WwXYMkVpwaxO85Uce8ab5hVF51q4A8sSBfKVi8VXJHRQgLkm2bfol/fJnsAfVo1kP wZnlpw== X-Received: by 2002:a05:600c:1d1e:b0:431:5e3c:2ff0 with SMTP id 5b1f17b1804b1-438dc3bd896mr16331305e9.8.1738139830095; Wed, 29 Jan 2025 00:37:10 -0800 (PST) X-Google-Smtp-Source: AGHT+IG0oTdCksnKM5Ry20svhj0xsJ1mBq1bwn5vByG9CcgFXtBiJpLbwjMnEpORx25ZVJThaToxEQ== X-Received: by 2002:a05:600c:1d1e:b0:431:5e3c:2ff0 with SMTP id 5b1f17b1804b1-438dc3bd896mr16331035e9.8.1738139829654; Wed, 29 Jan 2025 00:37:09 -0800 (PST) Received: from [192.168.10.3] ([151.62.97.55]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-438dcc81d74sm14240565e9.37.2025.01.29.00.37.08 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jan 2025 00:37:08 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: qemu-rust@nongnu.org Subject: [PATCH 1/2] rust: remove unnecessary Cargo.toml metadata Date: Wed, 29 Jan 2025 09:37:03 +0100 Message-ID: <20250129083705.1321407-2-pbonzini@redhat.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250129083705.1321407-1-pbonzini@redhat.com> References: <20250129083705.1321407-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -33 X-Spam_score: -3.4 X-Spam_bar: --- X-Spam_report: (-3.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.3, 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_H2=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Some items of Cargo.toml (readme, homepage, repository) are only present because of clippy::cargo warnings being enabled in rust/hw/char/pl011/src/lib.rs. But these items are not particularly useful and would be all the same for all Cargo.toml files in the QEMU workspace. Clean them up. Signed-off-by: Paolo Bonzini --- rust/hw/char/pl011/Cargo.toml | 3 --- rust/hw/char/pl011/README.md | 31 ------------------------------- rust/hw/char/pl011/src/lib.rs | 14 ++++++-------- rust/qemu-api-macros/Cargo.toml | 3 --- rust/qemu-api-macros/README.md | 1 - 5 files changed, 6 insertions(+), 46 deletions(-) delete mode 100644 rust/hw/char/pl011/README.md delete mode 100644 rust/qemu-api-macros/README.md diff --git a/rust/hw/char/pl011/Cargo.toml b/rust/hw/char/pl011/Cargo.toml index 58f3e859f7e..2b4097864df 100644 --- a/rust/hw/char/pl011/Cargo.toml +++ b/rust/hw/char/pl011/Cargo.toml @@ -4,10 +4,7 @@ version = "0.1.0" edition = "2021" authors = ["Manos Pitsidianakis "] license = "GPL-2.0-or-later" -readme = "README.md" -homepage = "https://www.qemu.org" description = "pl011 device model for QEMU" -repository = "https://gitlab.com/epilys/rust-for-qemu" resolver = "2" publish = false keywords = [] diff --git a/rust/hw/char/pl011/README.md b/rust/hw/char/pl011/README.md deleted file mode 100644 index cd7dea31634..00000000000 --- a/rust/hw/char/pl011/README.md +++ /dev/null @@ -1,31 +0,0 @@ -# PL011 QEMU Device Model - -This library implements a device model for the PrimeCell® UART (PL011) -device in QEMU. - -## Build static lib - -Host build target must be explicitly specified: - -```sh -cargo build --target x86_64-unknown-linux-gnu -``` - -Replace host target triplet if necessary. - -## Generate Rust documentation - -To generate docs for this crate, including private items: - -```sh -cargo doc --no-deps --document-private-items --target x86_64-unknown-linux-gnu -``` - -To include direct dependencies like `bilge` (bitmaps for register types): - -```sh -cargo tree --depth 1 -e normal --prefix none \ - | cut -d' ' -f1 \ - | xargs printf -- '-p %s\n' \ - | xargs cargo doc --no-deps --document-private-items --target x86_64-unknown-linux-gnu -``` diff --git a/rust/hw/char/pl011/src/lib.rs b/rust/hw/char/pl011/src/lib.rs index e2df4586bcc..e704daf6e3e 100644 --- a/rust/hw/char/pl011/src/lib.rs +++ b/rust/hw/char/pl011/src/lib.rs @@ -1,13 +1,12 @@ // Copyright 2024, Linaro Limited // Author(s): Manos Pitsidianakis // SPDX-License-Identifier: GPL-2.0-or-later -// -// PL011 QEMU Device Model -// -// This library implements a device model for the PrimeCell® UART (PL011) -// device in QEMU. -// -#![doc = include_str!("../README.md")] + +//! PL011 QEMU Device Model +//! +//! This library implements a device model for the PrimeCell® UART (PL011) +//! device in QEMU. +//! //! # Library crate //! //! See [`PL011State`](crate::device::PL011State) for the device model type and @@ -18,7 +17,6 @@ clippy::suspicious, clippy::complexity, clippy::perf, - clippy::cargo, clippy::nursery, clippy::style )] diff --git a/rust/qemu-api-macros/Cargo.toml b/rust/qemu-api-macros/Cargo.toml index 5a27b52ee6e..b9b4baecddb 100644 --- a/rust/qemu-api-macros/Cargo.toml +++ b/rust/qemu-api-macros/Cargo.toml @@ -4,10 +4,7 @@ version = "0.1.0" edition = "2021" authors = ["Manos Pitsidianakis "] license = "GPL-2.0-or-later" -readme = "README.md" -homepage = "https://www.qemu.org" description = "Rust bindings for QEMU - Utility macros" -repository = "https://gitlab.com/qemu-project/qemu/" resolver = "2" publish = false keywords = [] diff --git a/rust/qemu-api-macros/README.md b/rust/qemu-api-macros/README.md deleted file mode 100644 index f60f54ac4be..00000000000 --- a/rust/qemu-api-macros/README.md +++ /dev/null @@ -1 +0,0 @@ -# `qemu-api-macros` - Utility macros for defining QEMU devices From patchwork Wed Jan 29 08:37:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 13953531 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id A1ADFC0218D for ; Wed, 29 Jan 2025 08:38:15 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1td3ZY-0002xQ-Uy; Wed, 29 Jan 2025 03:37:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1td3ZW-0002wl-SL for qemu-devel@nongnu.org; Wed, 29 Jan 2025 03:37:18 -0500 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 1td3ZV-0006Wf-7n for qemu-devel@nongnu.org; Wed, 29 Jan 2025 03:37:18 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1738139836; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3kI2fmnmJgUGnjqtQ5jhxKS9I/PiFpAzsz1KC537irc=; b=WTmsxbFa+KInwVLqvRiEdUi4oZXmLsDflswYkDF8V/S6SSfiWbnDNJzqgMmt9HSPxcNQeV mji6AyHk6j2PokhJdWde/wxUnl7X+yD/HBdMk5kaVvnQfyVynEYCY/2aq3V7wLObRHrHw2 fEsXnd/VbNkrTDRVhX1QYzxm0Khf4Uw= 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-423-a4ZrR0dkPMGEFXi_XiKOdQ-1; Wed, 29 Jan 2025 03:37:14 -0500 X-MC-Unique: a4ZrR0dkPMGEFXi_XiKOdQ-1 X-Mimecast-MFC-AGG-ID: a4ZrR0dkPMGEFXi_XiKOdQ Received: by mail-wr1-f71.google.com with SMTP id ffacd0b85a97d-385d7611ad3so3527350f8f.2 for ; Wed, 29 Jan 2025 00:37:14 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738139833; x=1738744633; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3kI2fmnmJgUGnjqtQ5jhxKS9I/PiFpAzsz1KC537irc=; b=IZ7pm7ISi3WMYsgl+shIm4bULreX0rLTKhKSnuLMGg8bw9DVhDW3Q3gOdNaO+bdfpk VfdS8E09dh6wml8w6zGkUbNeigEDPmTHYEdE7SioE21R7iRonygOBP3UVVxIzHC+Cwob z3dlSrVS5VYJx6mZtx9i1mb9VFPhNf0ppsth7bjRUCuL15wNm5cXcAReI5NDzLpkNYs8 ZTcg8PhqhjuIJV6tmn11stc5d8/x0/kWfyy2R4ocqt8p/c4Ywn6YnuQuvaOUjfjz2rmV ng5UZ+fK2QLkcfFzEuulXwwQ+BtYTSs0ve7VmysfNtGQ573XuqbjnuF6tcdpvSVJtEK6 QF4g== X-Gm-Message-State: AOJu0YxZcbjFYytiHUdAB0785DZYOESkHeGFD1v0MIl51Ukwsr7rfEGo wlb9LrBv7Z1Du+kQR2fl24Ke3ZOvtDtwa1wVXUA4DKP/qyYrSRL136a1hNB6V4qU69rU0YsNNTR I1AzckhtpLCKj1bHvH6Er3/aUmtyGTYCHvzois8N8BmgeQVos5aEi7JNnFLGOIwtSweJGpg+alS ZD+Yz/THB8BRgZdAjoBja8aB1BwcM5DK9jKhZtNvU= X-Gm-Gg: ASbGncuVnNbElib8Zv7uH/gkgAVeC5NQKJ4e7yTxuXLoH1gUGrdFCjoLn+LvczE1gXj n5UwrSb5ipPIaYvnq0us3DaJiV8qpqqfzRYuZfds2ZKT2rpyNXQsKcpbQig3K80z1pAqAnaFayW mazCSfoUSMx+fw0I+BmHycDvJErT/FTCxsSamp17Gf2mTOF2qWgIJ7oxxvZXkGBH2qHGd/1tkPn RA5isHEKwDcYhG88I08YfriBnXoLw0e3dxCM5ovRpkLqTXAYuS/wbenRql/p8L8syh5FRNrzjf2 MNh96A== X-Received: by 2002:a5d:64ec:0:b0:386:3e87:2cd6 with SMTP id ffacd0b85a97d-38c5209018cmr1720068f8f.38.1738139832991; Wed, 29 Jan 2025 00:37:12 -0800 (PST) X-Google-Smtp-Source: AGHT+IHvvrO4BLXQh9+pbCl+W9wYsMvVqRAEChnfpEN5RzNO87Anj0E6WrQQjnhiBH+RSt9V0/6zfQ== X-Received: by 2002:a5d:64ec:0:b0:386:3e87:2cd6 with SMTP id ffacd0b85a97d-38c5209018cmr1720043f8f.38.1738139832485; Wed, 29 Jan 2025 00:37:12 -0800 (PST) Received: from [192.168.10.3] ([151.62.97.55]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-438dcc13202sm14625905e9.5.2025.01.29.00.37.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 29 Jan 2025 00:37:10 -0800 (PST) From: Paolo Bonzini To: qemu-devel@nongnu.org Cc: qemu-rust@nongnu.org Subject: [PATCH 2/2] rust: include rust_version in Cargo.toml Date: Wed, 29 Jan 2025 09:37:04 +0100 Message-ID: <20250129083705.1321407-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250129083705.1321407-1-pbonzini@redhat.com> References: <20250129083705.1321407-1-pbonzini@redhat.com> MIME-Version: 1.0 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: -33 X-Spam_score: -3.4 X-Spam_bar: --- X-Spam_report: (-3.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-1.3, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Tell clippy the minimum supported Rust version for QEMU. Signed-off-by: Paolo Bonzini --- rust/hw/char/pl011/Cargo.toml | 1 + rust/hw/char/pl011/src/device_class.rs | 1 - rust/qemu-api-macros/Cargo.toml | 1 + rust/qemu-api/Cargo.toml | 1 + 4 files changed, 3 insertions(+), 1 deletion(-) diff --git a/rust/hw/char/pl011/Cargo.toml b/rust/hw/char/pl011/Cargo.toml index 2b4097864df..f2296cad58b 100644 --- a/rust/hw/char/pl011/Cargo.toml +++ b/rust/hw/char/pl011/Cargo.toml @@ -9,6 +9,7 @@ resolver = "2" publish = false keywords = [] categories = [] +rust-version = "1.63.0" [lib] crate-type = ["staticlib"] diff --git a/rust/hw/char/pl011/src/device_class.rs b/rust/hw/char/pl011/src/device_class.rs index 8a157a663fb..dbef93f6cb3 100644 --- a/rust/hw/char/pl011/src/device_class.rs +++ b/rust/hw/char/pl011/src/device_class.rs @@ -12,7 +12,6 @@ use crate::device::{PL011Registers, PL011State}; -#[allow(clippy::missing_const_for_fn)] extern "C" fn pl011_clock_needed(opaque: *mut c_void) -> bool { let state = NonNull::new(opaque).unwrap().cast::(); unsafe { state.as_ref().migrate_clock } diff --git a/rust/qemu-api-macros/Cargo.toml b/rust/qemu-api-macros/Cargo.toml index b9b4baecddb..89dee1cfb39 100644 --- a/rust/qemu-api-macros/Cargo.toml +++ b/rust/qemu-api-macros/Cargo.toml @@ -9,6 +9,7 @@ resolver = "2" publish = false keywords = [] categories = [] +rust-version = "1.63.0" [lib] proc-macro = true diff --git a/rust/qemu-api/Cargo.toml b/rust/qemu-api/Cargo.toml index 4aa22f31986..a51dd142852 100644 --- a/rust/qemu-api/Cargo.toml +++ b/rust/qemu-api/Cargo.toml @@ -12,6 +12,7 @@ resolver = "2" publish = false keywords = [] categories = [] +rust-version = "1.63.0" [dependencies] qemu_api_macros = { path = "../qemu-api-macros" }