From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id gKbzIcOo0WBAKAAAgWs5BA (envelope-from ) for ; Tue, 22 Jun 2021 11:09:23 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id WEysHcOo0WAEKQAA1q6Kng (envelope-from ) for ; Tue, 22 Jun 2021 09:09:23 +0000 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 aspmx1.migadu.com (Postfix) with ESMTPS id 40A1219D9A for ; Tue, 22 Jun 2021 11:09:23 +0200 (CEST) Received: from localhost ([::1]:47110 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lvcPK-0000is-97 for larch@yhetil.org; Tue, 22 Jun 2021 05:09:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:58904) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lvcP4-0008U0-Dk for guix-patches@gnu.org; Tue, 22 Jun 2021 05:09:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54497) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lvcP1-00031q-Qe for guix-patches@gnu.org; Tue, 22 Jun 2021 05:09:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lvcP0-0007nN-Et for guix-patches@gnu.org; Tue, 22 Jun 2021 05:09:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49169] [PATCH 03/11] lint: Add 'input-labels' checker. Resent-From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 22 Jun 2021 09:09:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49169 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49169@debbugs.gnu.org Cc: Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 49169-submit@debbugs.gnu.org id=B49169.162435293229896 (code B ref 49169); Tue, 22 Jun 2021 09:09:02 +0000 Received: (at 49169) by debbugs.gnu.org; 22 Jun 2021 09:08:52 +0000 Received: from localhost ([127.0.0.1]:37798 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lvcOp-0007m0-O7 for submit@debbugs.gnu.org; Tue, 22 Jun 2021 05:08:52 -0400 Received: from eggs.gnu.org ([209.51.188.92]:32832) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lvcOn-0007lH-9i for 49169@debbugs.gnu.org; Tue, 22 Jun 2021 05:08:49 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]:52814) by eggs.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lvcOh-0002nY-UB; Tue, 22 Jun 2021 05:08:43 -0400 Received: from [2a01:e0a:1d:7270:af76:b9b:ca24:c465] (port=49370 helo=gnu.org) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lvcOh-0000B8-MV; Tue, 22 Jun 2021 05:08:43 -0400 From: Ludovic =?UTF-8?Q?Court=C3=A8s?= Date: Tue, 22 Jun 2021 11:08:22 +0200 Message-Id: <20210622090830.15561-3-ludo@gnu.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210622090830.15561-1-ludo@gnu.org> References: <20210622090830.15561-1-ludo@gnu.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1624352963; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=rezlQ3j/2joZ0hANN24vnkk8lOjxY+1JisuBusTvI1I=; b=Vcsj3UA76uO+Fo1CltFsFRV/QlMyRaaxuV0vU/4l/iOq+TTiTQywmLXXzwucYubTDDmyme hkSzwTUSD2o1nttjRSQRCK2NsXewJVMucSWjnSQTQEnuCCkiypfk26l03J4BU2YcU2S2SN ZzdVWgi9/KEegZAb920BSn2AJipN+Fz8eQnp5rlYyy7CqrjJQDaFSHnmwyFYjlkfwcAQqC CPiNey3RGaB8782LkS52nJTKl5J7P77R3HIN29ctC3fd2Gz0zm3RKruj80QPLpzmqDkz8M O6A1mnrtNpY/579brshCwRPdQhIPLJRBTWWnxoiIoNLHQM6vlfaeGoz9Lu3v1g== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1624352963; a=rsa-sha256; cv=none; b=W2BO2P/wjOtoWNGQDSdsQBWHsAPT8ZOkdjj5FW1R2Adr1n6Z1GM0nNdqK+/5laWTICeeqO 1QQfiITofb/EHRIvJ7tMXOqernhD1xA3mULM3zq+EYLcOtE/GBlYU8894k8sYqB/2tHbcE fuIhqclPg4Soa+Zck01SBddvfTc7/nY9kJ4CeaET7yurKNG7+XstJrqdd0oXIv9OZrcewQ 9jYYTLp5HDMJK5F2H/PeuYBNx9D1cvcKt/rsDVahOV+/GrGoBvfNAdp40tue4Ls2KsxouR Fj1GUIac3QpNoTt4nXNiGCWukfVAOvXSqNNcXji0AmOhYxC5o/LW+Mx4V2ktiQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: 2.07 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=pass (policy=none) header.from=gnu.org; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: 40A1219D9A X-Spam-Score: 2.07 X-Migadu-Scanner: scn0.migadu.com X-TUID: j1je6tk7Ss/l * guix/lint.scm (check-input-labels): New procedure. (%local-checkers): Add 'input-labels' checker. * tests/lint.scm ("input labels: no warnings") ("input labels: one warning"): New tests. * doc/guix.texi (Invoking guix lint): Mention it. --- doc/guix.texi | 6 ++++++ guix/lint.scm | 36 ++++++++++++++++++++++++++++++++++++ tests/lint.scm | 14 ++++++++++++++ 3 files changed, 56 insertions(+) diff --git a/doc/guix.texi b/doc/guix.texi index 1a3ac85e58..5ff3898ff1 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -12114,6 +12114,12 @@ declare them as in this example: @item formatting Warn about obvious source code formatting issues: trailing white space, use of tabulations, etc. + +@item input-labels +Report old-style input labels that do not match the name of the +corresponding package. This aims to help migrate from the ``old input +style''. @xref{package Reference}, for more information on package +inputs and input styles. @end table The general syntax is: diff --git a/guix/lint.scm b/guix/lint.scm index 1bebfe03d3..7b73dffa19 100644 --- a/guix/lint.scm +++ b/guix/lint.scm @@ -77,6 +77,7 @@ #:export (check-description-style check-inputs-should-be-native check-inputs-should-not-be-an-input-at-all + check-input-labels check-patch-file-names check-patch-headers check-synopsis-style @@ -383,6 +384,37 @@ of a package, and INPUT-NAMES, a list of package specifications such as (package-input-intersection (package-direct-inputs package) input-names)))) +(define (check-input-labels package) + "Emit a warning for labels that differ from the corresponding package name." + (define (check input-kind package-inputs) + (define (warning label name) + (make-warning package + (G_ "label '~a' does not match package name '~a'") + (list label name) + #:field input-kind)) + + (append-map (match-lambda + (((? string? label) (? package? dependency)) + (if (string=? label (package-name dependency)) + '() + (list (warning label (package-name dependency))))) + (((? string? label) (? package? dependency) output) + (let ((expected (string-append (package-name dependency) + ":" output))) + (if (string=? label expected) + '() + (list (warning label expected))))) + (_ + '())) + (package-inputs package))) + + (append-map (match-lambda + ((kind proc) + (check kind proc))) + `((native-inputs ,package-native-inputs) + (inputs ,package-inputs) + (propagated-inputs ,package-propagated-inputs)))) + (define (package-name-regexp package) "Return a regexp that matches PACKAGE's name as a word at the beginning of a line." @@ -1493,6 +1525,10 @@ them for PACKAGE." (name 'inputs-should-not-be-input) (description "Identify inputs that shouldn't be inputs at all") (check check-inputs-should-not-be-an-input-at-all)) + (lint-checker + (name 'input-labels) + (description "Identify input labels that do not match package names") + (check check-input-labels)) (lint-checker (name 'license) ;; TRANSLATORS: is the name of a data type and must not be diff --git a/tests/lint.scm b/tests/lint.scm index 02ffb19d78..f247012c09 100644 --- a/tests/lint.scm +++ b/tests/lint.scm @@ -319,6 +319,20 @@ `(("python-setuptools" ,python-setuptools)))))) (check-inputs-should-not-be-an-input-at-all pkg)))) +(test-assert "input labels: no warnings" + (let ((pkg (dummy-package "x" + (inputs `(("glib" ,glib) + ("pkg-config" ,pkg-config)))))) + (null? (check-input-labels pkg)))) + +(test-equal "input labels: one warning" + "label 'pkgkonfig' does not match package name 'pkg-config'" + (single-lint-warning-message + (let ((pkg (dummy-package "x" + (inputs `(("glib" ,glib) + ("pkgkonfig" ,pkg-config)))))) + (check-input-labels pkg)))) + (test-equal "file patches: different file name -> warning" "file names of patches should start with the package name" (single-lint-warning-message -- 2.32.0