From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail02.groups.io (mail02.groups.io [66.175.222.108]) by spool.mail.gandi.net (Postfix) with ESMTPS id 3A3D5D80A13 for ; Mon, 13 Nov 2023 11:58:32 +0000 (UTC) DKIM-Signature: a=rsa-sha256; bh=Ej1uGWL/bQGIj9coH7sSimJhMFSQBpjHPHX5Ou1YzQk=; c=relaxed/simple; d=groups.io; h=Message-ID:Date:MIME-Version:To:Cc:From:Subject:Precedence:List-Subscribe:List-Help:Sender:List-Id:Mailing-List:Delivered-To:Reply-To:List-Unsubscribe-Post:List-Unsubscribe:Content-Language:Content-Type:Content-Transfer-Encoding; s=20140610; t=1699876711; v=1; b=QBYXSRDtSW22cIaa2XARPFv4LCorWtjXyr8fMlRfl/OjTMaTf2mw34TiYkorWwmkw8dNEejZ 1KO9UMsj90n3X+lem1/dlr9d29vwftbN7uh2rH8esHBJepEG6Y1KMaFAjw9Y+Grc20Q4i79ZM/0 5auj8tqh0gCu37eorC6d+ehk= X-Received: by 127.0.0.2 with SMTP id mvjWYY7687511xLGl3PV9Vlg; Mon, 13 Nov 2023 03:58:31 -0800 X-Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mx.groups.io with SMTP id smtpd.web10.35100.1699876711142552419 for ; Mon, 13 Nov 2023 03:58:31 -0800 X-Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-201-BwqbfhFqMVKYMiTTxuKe-Q-1; Mon, 13 Nov 2023 06:58:28 -0500 X-MC-Unique: BwqbfhFqMVKYMiTTxuKe-Q-1 X-Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.rdu2.redhat.com [10.11.54.2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E370229AA383; Mon, 13 Nov 2023 11:58:27 +0000 (UTC) X-Received: from [10.39.192.220] (unknown [10.39.192.220]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C390340C6EB9; Mon, 13 Nov 2023 11:58:26 +0000 (UTC) Message-ID: <0107c96b-849a-db48-194b-1a4c1f3b0c78@redhat.com> Date: Mon, 13 Nov 2023 12:58:25 +0100 MIME-Version: 1.0 To: edk2-devel-groups-io , Michael Kubacki Cc: Michael Kinney , Pedro Falcato , Andrew Fish , Marcin Juszkiewicz , "Leif Lindholm (Quic)" From: "Laszlo Ersek" Subject: [edk2-devel] edk2 uncrustify update (73.0.8)? X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.2 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Precedence: Bulk List-Subscribe: List-Help: Sender: devel@edk2.groups.io List-Id: Mailing-List: list devel@edk2.groups.io; contact devel+owner@edk2.groups.io Reply-To: devel@edk2.groups.io,lersek@redhat.com List-Unsubscribe-Post: List-Unsubscribe=One-Click List-Unsubscribe: X-Gm-Message-State: rWDjmtJ2Ajmd32mNMjV0brqgx7686176AA= Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-GND-Status: LEGIT Authentication-Results: spool.mail.gandi.net; dkim=pass header.d=groups.io header.s=20140610 header.b=QBYXSRDt; spf=pass (spool.mail.gandi.net: domain of bounce@groups.io designates 66.175.222.108 as permitted sender) smtp.mailfrom=bounce@groups.io; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=redhat.com (policy=none) Hi Michael, recently I encountered an uncrustify failure on github. The reason was that my local uncrustify was *more recent* (73.0.8) than the one we use in edk2 CI (which is 73.0.3, per the edk2 file ".pytool/Plugin/UncrustifyCheck/uncrustify_ext_dep.yaml"). Updating the version number in the YAML file (i.e., advancing edk2 to version 73.0.8) seems easy enough, but: - Do you think 73.0.8 is mature enough for adoption in edk2? This upstream uncrustify release was tagged in April (and I can't see any more recent commits), so I assume it should be stable. - Would the version update require a whole-tree re-uncrustification? The reason I'm not just ignoring this topic is that 73.0.8 actually produces *better output* than 73.0.3, at least in the one instance I encountered. Compare: > diff --git a/OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDevic= eSupport.c b/OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceS= upport.c > index 434cdca84b23..3a6f75988220 100644 > --- a/OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSuppor= t.c > +++ b/OvmfPkg/IncompatiblePciDeviceSupportDxe/IncompatiblePciDeviceSuppor= t.c > @@ -43,12 +43,12 @@ STATIC EFI_INCOMPATIBLE_PCI_DEVICE_SUPPORT_PROTOCOL > STATIC CONST EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR mMmio64Configuration =3D= { > ACPI_ADDRESS_SPACE_DESCRIPTOR, // Desc > (UINT16)( // Len > - sizeof (EFI_ACPI_ADDR= ESS_SPACE_DESCRIPTOR) - > - OFFSET_OF ( > - EFI_ACPI_ADDRESS_SP= ACE_DESCRIPTOR, > - ResType > - ) > - ), > + sizeof (EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR) - > + OFFSET_OF ( > + EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR, > + ResType > + ) > + ), > ACPI_ADDRESS_SPACE_TYPE_MEM, // ResType > 0, // GenFlag > 0, // SpecificFlag > @@ -77,12 +77,12 @@ STATIC CONST EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR mMmio= 64Configuration =3D { > STATIC CONST EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR mOptionRomConfiguration = =3D { > ACPI_ADDRESS_SPACE_DESCRIPTOR, // Desc > (UINT16)( // Len > - sizeof (EFI_ACPI_ADDR= ESS_SPACE_DESCRIPTOR) - > - OFFSET_OF ( > - EFI_ACPI_ADDRESS_SP= ACE_DESCRIPTOR, > - ResType > - ) > - ), > + sizeof (EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR) - > + OFFSET_OF ( > + EFI_ACPI_ADDRESS_SPACE_DESCRIPTOR, > + ResType > + ) > + ), > ACPI_ADDRESS_SPACE_TYPE_MEM, // ResType > 0, // GenFlag > 0, // Disable option rom= s SpecificFlag Note that 73.0.3 indents the subexpression to the "//" comment on the previous line, while 73.0.8 ignores the comment -- which I think is justified here. I believe this improvement may come from uncrustify commit 239c4fad745b ("Prevent endless indentation scenario in struct assignment", 2022-07-29). I think it's worth having in edk2. CC: stewards, Pedro (commit 6ded9f50c3aa), Marcin (traditionally a big fan of uncrustify :)) Thanks Laszlo -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#111147): https://edk2.groups.io/g/devel/message/111147 Mute This Topic: https://groups.io/mt/102559740/7686176 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/leave/12367111/7686176/19134562= 12/xyzzy [rebecca@openfw.io] -=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-=3D-