From patchwork Thu Oct 10 17:59:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: karthik nayak X-Patchwork-Id: 13830619 Received: from mail-ed1-f48.google.com (mail-ed1-f48.google.com [209.85.208.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6D1D31C1ABE for ; Thu, 10 Oct 2024 17:59:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728583159; cv=none; b=A4ZRvhasnjgc8O7yYDAeViQifjQ56q3d8VVFh4H3SmuksLXM9iUvmhm7uEXqbEgv1fT3pl3QzczkRJyVqvCK186ZENZla3c5pBO+lwPTHhX5IKPVZgiaNcMHCBXImWZEEPS/XzCaMDwdeCtjnvHARn10xYTcocOMqmjq5iFI6cY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728583159; c=relaxed/simple; bh=Q0yHjm0/uJa0AAruC3fqk6K3HMcq33NPbaVHTSBxXoI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SiRfO3YPOZOMrTw56WQQomWoBPi2jWmadhIzcLPnQ9XE9kjIXudyQHEFPgImzFzSfQgd78hsac7yTqU84skWm+2ROy/OTbM71iKIz1azg/bREKB4O5YlnJRBg7ooHq+TkxKZGybQ05Ulenm0bJPeDCmDC6VQkszuhfCv5yucwUs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=b4MBjgS0; arc=none smtp.client-ip=209.85.208.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="b4MBjgS0" Received: by mail-ed1-f48.google.com with SMTP id 4fb4d7f45d1cf-5c89f3e8a74so1546778a12.0 for ; Thu, 10 Oct 2024 10:59:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728583156; x=1729187956; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1goZbVpUqBcA+JJH9ZJi9mPq/UqfKzZ3cUUK8wqywPo=; b=b4MBjgS0Qh1/2VOJbnsR1BJjwVeqMFVNRqrhZ5zB/WngIKJJUx9bWcDGGqRGniYftS 7fBnNNjhmStdzyXskITkOu2cldqYS3j1q7zbiHICC/1fNWUo38VxaH8c/id8jkO86lc5 kJ3DHbqA+Hw7VNZoseX5/0jcSS+LxIiSBys2KYMX1+VI9r52rNFJBhHIZDP1tjPjkF+w wwVDcpiSjbBNNvpA2bSlkZuWT3oizb6zOzs+5kSSLbhgyb2pUFEUcqrKx6iCxbsJgMmD m3UrXjE6sYw/tGZAVTtwEAjE5Bc5/LsYoNr4LXy9mTi/qUnsJGyGiKyMFpHkFU1gzyt4 YKCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728583156; x=1729187956; 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=1goZbVpUqBcA+JJH9ZJi9mPq/UqfKzZ3cUUK8wqywPo=; b=bKIt3Ob+SXqmk7TIp0Ro4+utTCU8spQlL2TsaA3NJ6w73jpfof0BPHlRAu9EueiA/g k90x5OWIBYFZt7LjWGt6JwxozoZrrBDt5/9h4Wmb4Q1gNnXHXAXk1kOvfyXNaSBlcQ1J g0dJw4VyMQddyIx8zUqshIJaUBUW/tw3R7gypZLUBRdiiIa3tEbJEkmL/L+nkLyajTPg fZmxR7sY/hJy3r5A4n3MnnKDjroCW4y0razpvG9KS0fMJBC74zpIauWWEJr1U87AFp5a PQllAPDfr5IRSH4ejaCERRCbABclirUd5nzivEJ/kn4OTK2a0GgjupeBRlfyGMS9Np/b YiAw== X-Gm-Message-State: AOJu0YwlRtq5X9FvIQLvuk/pTHVGiGE6EyDGr8LWamVVqeo5PLwLb1wO YZS67nXSzA25iktW24XcX589ZaB2TpDnWXGkD0uZLovJBVombb0H X-Google-Smtp-Source: AGHT+IE0lcDrLEfnIVbOVUTXKogY1Thqzz7gahn2Bdrq6y6wTbk6J2Na4P25I1imv6adpAfTLDoCRw== X-Received: by 2002:a05:6402:4411:b0:5c4:a6f:9be7 with SMTP id 4fb4d7f45d1cf-5c91d57f4a4mr6885996a12.8.1728583155647; Thu, 10 Oct 2024 10:59:15 -0700 (PDT) Received: from archlinux.fritz.box ([2a02:2455:825d:6a00:6bb4:436f:5699:ff21]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5c9372608f4sm1059995a12.70.2024.10.10.10.59.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Oct 2024 10:59:15 -0700 (PDT) From: Karthik Nayak To: karthik.188@gmail.com Cc: git@vger.kernel.org, gitster@pobox.com, jltobler@gmail.com, toon@iotcl.com Subject: [PATCH v2 1/3] clang-format: change column limit to 96 characters Date: Thu, 10 Oct 2024 19:59:09 +0200 Message-ID: X-Mailer: git-send-email 2.47.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The current value for the column limit is set to 80. While this is as expected, we often prefer readability over this strict limit. This means it is common to find code which extends over 80 characters. So let's change the column limit to be 96 instead. This provides some slack so we can ensure readability takes preference over the 80 character hard limit. Signed-off-by: Karthik Nayak --- .clang-format | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.clang-format b/.clang-format index 41969eca4b..684ab32d28 100644 --- a/.clang-format +++ b/.clang-format @@ -12,7 +12,10 @@ UseTab: Always TabWidth: 8 IndentWidth: 8 ContinuationIndentWidth: 8 -ColumnLimit: 80 + +# While we recommend keeping column limit to 80, we want to also provide +# some slack to maintain readability. +ColumnLimit: 96 # C Language specifics Language: Cpp From patchwork Thu Oct 10 17:59:10 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: karthik nayak X-Patchwork-Id: 13830621 Received: from mail-lj1-f169.google.com (mail-lj1-f169.google.com [209.85.208.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0D5201C9DF7 for ; Thu, 10 Oct 2024 17:59:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728583160; cv=none; b=D2hnWvk9l1QVUKZx/19sn03xBYGKvaehHc9ELZHqIeViFeoERlCDX/X8kziRX9AxwTvy02tGl4acw48317r980gimMrm4Z8CH1bJd2oygGLjkud1VWMXzT8i9+RDNjy9v2SSH1zPdtQAUVgdScFFc7Qx7m1Kt+4J4B/QxZEjw4o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728583160; c=relaxed/simple; bh=vZYfxemH7dVb5XGbvjQlwOvlocskwDxUMBgufGVgV3w=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eISWWu9diLLa9Tv2f1fhkdVA4tl9oTZ2b/GWZlw9ZSKzicqL9S2GqU2ewNkADOSxzdf243SCViZuSKVgksbw3Tn7ecnPyGDNVcZpNRVq/e3qiqcYZmQ9ohZ0WY4d3XMzbOGZXtC0AcDDekPjb/38MtXQzh28So5zmv/jPZscbGQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=MdOvluuI; arc=none smtp.client-ip=209.85.208.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="MdOvluuI" Received: by mail-lj1-f169.google.com with SMTP id 38308e7fff4ca-2fad75b46a3so12652241fa.2 for ; Thu, 10 Oct 2024 10:59:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728583157; x=1729187957; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=UXLJNjjeat/lCLMwnHSv8+tzE0k8FFTu+ZaWN+R7ofw=; b=MdOvluuIzxccM34FMmqbjKcK1RzwWkwK8T923F/ygvjVGmAN1Qa0DWSqcmiR/RrtLh CShxYM1GG9w6K/EiJ5SoVY2m91ug8KHTWFrJvkYo+9/jTsW9sW4uofhlRbd52eBdwK/I hirHhREGFs6qf172V6nvgNdMKpeoiK4tfWuWWExCckiehKMsOy8mKoqLNrTIw6lpo7eD O6EfTHDbiIM3D2Q3jSAaZC/wnyfOc/qsoe3paYhHitGhuzvXcEBRqTEkAB9z8rfor8d2 sZGKdhgwwFtYJjpO3v13TwM7xJ/cAOBk76tu70OSsYMGBwO83NnT1xT15kFmOWd6ddup QhIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728583157; x=1729187957; 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=UXLJNjjeat/lCLMwnHSv8+tzE0k8FFTu+ZaWN+R7ofw=; b=lJbUVFyG67MDQnZUds4TmDxNk0fFLn6TBrJHV6GKacGoRaJvaIo5CD9iC5Tc6gCcM5 aszD7Qve2VxLNemkEUhht9K6Xy5JfrTfIdBC/iUQBqoevKA2x9wlP+8K5UC9T4I+Q3kP g1ll4mj370WMwdsqTpqrRdX2yTCw3qxeY1n/DcMfCgFc1yt/1Zeo/tUZPvoVnfqDl3m0 yx2I9yhF1MI1Y2sQXe2kJS7/IhmKAmLY+AleP4zlMMYYUHz1LYjEYmPHeKjlnCe/OHQG 7R4czJsf9wU0Ng07al8ojZNJ0JdB/ZXAZn5p6PXJZDHDVZDfQBFra21CySoLyyp7otX3 yFSw== X-Gm-Message-State: AOJu0YzUu3V3KkeQIk+v3V2Qs7QWwM1Byb6SibS2BYftytdc3MtrMIMp 5Wy48Utmpnv0l4TLrc+QHNRwKwgciu+GIdPXp96P1QKvm1Maq8ma X-Google-Smtp-Source: AGHT+IHR0BRDjKGS/eyIgCGo+TMtTTtmvhVmOVUExhB3FK2BQBC04cha829h2NU1h9NPZBHOAFRkHw== X-Received: by 2002:a05:6512:1116:b0:533:4b70:8722 with SMTP id 2adb3069b0e04-539d49ca397mr235947e87.15.1728583156780; Thu, 10 Oct 2024 10:59:16 -0700 (PDT) Received: from archlinux.fritz.box ([2a02:2455:825d:6a00:6bb4:436f:5699:ff21]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5c9372608f4sm1059995a12.70.2024.10.10.10.59.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Oct 2024 10:59:16 -0700 (PDT) From: Karthik Nayak To: karthik.188@gmail.com Cc: git@vger.kernel.org, gitster@pobox.com, jltobler@gmail.com, toon@iotcl.com Subject: [PATCH v2 2/3] clang-format: don't align expressions after linebreaks Date: Thu, 10 Oct 2024 19:59:10 +0200 Message-ID: X-Mailer: git-send-email 2.47.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 We enforce alignment of expressions after linebreaks. Which means for code such as return a || b; it will expect: return a || b; we instead want 'b' to be indent with tabs, which is already done by the 'ContinuationIndentWidth' variable. So let's explicitly set 'AlignOperands' to false. Signed-off-by: Karthik Nayak --- .clang-format | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.clang-format b/.clang-format index 684ab32d28..d655b08ff6 100644 --- a/.clang-format +++ b/.clang-format @@ -42,10 +42,9 @@ AlignConsecutiveDeclarations: false # int cccccccc; AlignEscapedNewlines: Left -# Align operands of binary and ternary expressions -# int aaa = bbbbbbbbbbb + -# cccccc; -AlignOperands: true +# Don't enforce alignment after linebreaks and instead +# rely on the ContinuationIndentWidth value. +AlignOperands: false # Don't align trailing comments # int a; // Comment a From patchwork Thu Oct 10 17:59:11 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: karthik nayak X-Patchwork-Id: 13830622 Received: from mail-ed1-f48.google.com (mail-ed1-f48.google.com [209.85.208.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8E3A51CDA2F for ; Thu, 10 Oct 2024 17:59:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728583161; cv=none; b=BDxWXKo86zvBB0oArOIJBntspLAUotX4HGmsmvZhUuvdFmkBKPSc1CvGBd4Gnjj+T0hPul7TTd5GVcGhX7lKx6Ggp+8156mVvxp4v+8O17PjPllSuSOR8M2kwrnvGpRB13C2Uj2sAsMcQl2IEbCOSUADL7Ia2rMdRtlyeynWUaU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1728583161; c=relaxed/simple; bh=GCV0b7WimHT/zs/J2i0xhuYCqqjmycV1vGTRUHpvp3c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GZqXMlNaqILXNzK7HOMBZ4s2vnKSlFB+Re+6loShfSwep6I+doMOfzzGEhTVpSafpOe2MqEQxjDErDPHznBdGSwWD/dT6HeqEFvu4ic7iNvqSmKO6NOsbYewzgBarInwPsh7Ycf43vy1nTgJ8oGPRirOxsSeuebaAaSdbXkq0jE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=XTj0c9JK; arc=none smtp.client-ip=209.85.208.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="XTj0c9JK" Received: by mail-ed1-f48.google.com with SMTP id 4fb4d7f45d1cf-5c5bca6603aso1380166a12.1 for ; Thu, 10 Oct 2024 10:59:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728583158; x=1729187958; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=aS5qzjDh8HtV9jAGqw4Hw1nQflg2cdOkuSbGuvHPIUg=; b=XTj0c9JKAKzFeAL09vqrEAZO5RpEQ/3tNoLdcB1NbPNHnJFslFzJcMPOZcJ4J1HWQO 3ov0p26No/N0ohpKhzLKuAyxrbFmwOqTOlJBXDxTx8WcMtKXpX+IjBWYdj0EYsBT4mq+ 7U2v/w24Y77cRDBpo4GnphlMK6a7DHlF9aJZIHf9LoSCGvaB2B9aroDfo7fNrXjm587n cPXPKUDlXRd/TYuN8iz0u0uZ82sP5cX65BOsz894Oyl4pGkO2Ux9ryD1lDvJwqnYforB cb+l+nKg44HQoZf9c5J1Ko01sLm7oabspYTtWz8MawP1tMDpm+asY5xtNpT2g7OMxT+C MH9w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728583158; x=1729187958; 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=aS5qzjDh8HtV9jAGqw4Hw1nQflg2cdOkuSbGuvHPIUg=; b=g3mAdgEjj6Kcimfngj+zINLECEG1HQubnXiksrCn79daXvn2np8FMjgNdluDVu5fNF IpTbC5SafdvJ+3a3KzLBGXzftX2yQQc3IcJxqDUUS+iSz7uHQMy24phuY623hUx4zjoc 80CQBYyd62XKPu/yZK5Ow6zIU1HGB1GFm/iySPNRTQQzo1Izart2hsb+qtpe3GGRsx+a YkxC/iNXGCiYmyLjBKxwy6C7vXrhTu0GatZnO+78HugqUWBbtatFH9NG/cXPu7GYzI6T s0MwMleTcSk3SwkroWvwfXEI0zeEv/toJikTkczhrb4j+Xnr0oNhkYVba7U3l9RQ9RGc 97/w== X-Gm-Message-State: AOJu0YwJkmDI1xAM8b320xN3S69FPY/St0aHTjGNIPj59WhznifUAseN efgKc6doYNa6sYd8eudJkgnb+kdyR73R5khUuRgA/W/PHMn4uxZ4xeMTTlF5 X-Google-Smtp-Source: AGHT+IGdCpk4RjEc3srteOEmTb92UEZYtfSFCA7FB6wTDbBmZIOJ2DWBHaPUgBleafbO1ISW7aHCYw== X-Received: by 2002:a05:6402:524e:b0:5c8:81bd:ac90 with SMTP id 4fb4d7f45d1cf-5c91d65c330mr5802306a12.27.1728583157726; Thu, 10 Oct 2024 10:59:17 -0700 (PDT) Received: from archlinux.fritz.box ([2a02:2455:825d:6a00:6bb4:436f:5699:ff21]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5c9372608f4sm1059995a12.70.2024.10.10.10.59.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Oct 2024 10:59:17 -0700 (PDT) From: Karthik Nayak To: karthik.188@gmail.com Cc: git@vger.kernel.org, gitster@pobox.com, jltobler@gmail.com, toon@iotcl.com Subject: [PATCH v2 3/3] clang-format: align consecutive macro definitions Date: Thu, 10 Oct 2024 19:59:11 +0200 Message-ID: <6ebcd2690e05820e15584fe5459dc46011fde101.1728582927.git.karthik.188@gmail.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: References: Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 We generally align consecutive macro definitions for better readability: #define OUTPUT_ANNOTATE_COMPAT (1U<<0) #define OUTPUT_LONG_OBJECT_NAME (1U<<1) #define OUTPUT_RAW_TIMESTAMP (1U<<2) #define OUTPUT_PORCELAIN (1U<<3) over #define OUTPUT_ANNOTATE_COMPAT (1U<<0) #define OUTPUT_LONG_OBJECT_NAME (1U<<1) #define OUTPUT_RAW_TIMESTAMP (1U<<2) #define OUTPUT_PORCELAIN (1U<<3) So let's add the rule in clang-format to follow this. Signed-off-by: Karthik Nayak --- .clang-format | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.clang-format b/.clang-format index d655b08ff6..22ae882923 100644 --- a/.clang-format +++ b/.clang-format @@ -35,6 +35,9 @@ AlignConsecutiveAssignments: false # double b = 3.14; AlignConsecutiveDeclarations: false +# Align consecutive macro definitions. +AlignConsecutiveMacros: true + # Align escaped newlines as far left as possible # #define A \ # int aaaa; \