From unknown Sun Jul 27 08:11:15 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#61842 <61842@debbugs.gnu.org> To: bug#61842 <61842@debbugs.gnu.org> Subject: Status: [PATCH] file-systems: Remove deprecated 'title' field helper procedures. Reply-To: bug#61842 <61842@debbugs.gnu.org> Date: Sun, 27 Jul 2025 15:11:15 +0000 retitle 61842 [PATCH] file-systems: Remove deprecated 'title' field helper = procedures. reassign 61842 guix-patches submitter 61842 Bruno Victal severity 61842 normal tag 61842 patch thanks From debbugs-submit-bounces@debbugs.gnu.org Mon Feb 27 09:59:57 2023 Received: (at submit) by debbugs.gnu.org; 27 Feb 2023 14:59:57 +0000 Received: from localhost ([127.0.0.1]:48563 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWeyq-00063U-Tf for submit@debbugs.gnu.org; Mon, 27 Feb 2023 09:59:57 -0500 Received: from lists.gnu.org ([209.51.188.17]:35530) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pWeyo-00063L-5d for submit@debbugs.gnu.org; Mon, 27 Feb 2023 09:59:55 -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 1pWeyn-0008D9-JY for guix-patches@gnu.org; Mon, 27 Feb 2023 09:59:53 -0500 Received: from smtpm6.myservices.hosting ([185.26.105.207]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pWeyl-0003Dl-RD for guix-patches@gnu.org; Mon, 27 Feb 2023 09:59:53 -0500 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm6.myservices.hosting (Postfix) with ESMTP id 3B97520CBE for ; Mon, 27 Feb 2023 15:59:48 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id EC2A280097; Mon, 27 Feb 2023 15:59:47 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id AShG3xpSDsOH; Mon, 27 Feb 2023 15:59:47 +0100 (CET) Received: from guix-nuc.home.arpa (bl9-119-177.dsl.telepac.pt [85.242.119.177]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 738A780079; Mon, 27 Feb 2023 15:59:47 +0100 (CET) From: Bruno Victal To: guix-patches@gnu.org Subject: [PATCH] file-systems: Remove deprecated 'title' field helper procedures. Date: Mon, 27 Feb 2023 14:59:39 +0000 Message-Id: X-Mailer: git-send-email 2.39.1 MIME-Version: 1.0 X-Debbugs-CC: ludo@gnu.org Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=185.26.105.207; envelope-from=mirai@makinata.eu; helo=smtpm6.myservices.hosting X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: -1.3 (-) X-Debbugs-Envelope-To: submit Cc: Bruno Victal X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.3 (--) * gnu/system/file-systems.scm (): Change constructor name to 'file-system'. (report-deprecation, device-expression, process-file-system-declaration, file-system): Remove macros. (file-system-title): Remove procedure. --- gnu/system/file-systems.scm | 69 +------------------------------------ 1 file changed, 1 insertion(+), 68 deletions(-) diff --git a/gnu/system/file-systems.scm b/gnu/system/file-systems.scm index f2eb2e0837..b236011100 100644 --- a/gnu/system/file-systems.scm +++ b/gnu/system/file-systems.scm @@ -42,7 +42,6 @@ (define-module (gnu system file-systems) file-system? file-system-device file-system-device->string - file-system-title ;deprecated file-system-mount-point file-system-type file-system-needed-for-boot? @@ -158,7 +157,7 @@ (define-syntax validate-file-system-flags #'%validate-file-system-flags)))) ;; File system declaration. -(define-record-type* %file-system +(define-record-type* file-system make-file-system file-system? (device file-system-device) ; string | | @@ -200,72 +199,6 @@ (define-record-type (format port "#" (file-system-label->string obj)))) -(define-syntax report-deprecation - (lambda (s) - "Report the use of the now-deprecated 'title' field." - (syntax-case s () - ((_ field) - (let* ((source (syntax-source #'field)) - (file (and source (assq-ref source 'filename))) - (line (and source - (and=> (assq-ref source 'line) 1+))) - (column (and source (assq-ref source 'column)))) - (format (current-error-port) - "~a:~a:~a: warning: 'title' field is deprecated~%" - file line column) - #t))))) - -;; Helper for 'process-file-system-declaration'. -(define-syntax device-expression - (syntax-rules (quote label uuid device) - ((_ (quote label) dev) - (file-system-label dev)) - ((_ (quote uuid) dev) - (if (uuid? dev) dev (uuid dev))) - ((_ (quote device) dev) - dev) - ((_ title dev) - (case title - ((label) (file-system-label dev)) - ((uuid) (uuid dev)) - (else dev))))) - -;; Helper to interpret the now-deprecated 'title' field. Detect forms like -;; (title 'label), remove them, and adjust the 'device' field accordingly. -;; TODO: Remove this once 'title' has been deprecated long enough. -(define-syntax process-file-system-declaration - (syntax-rules (device title) - ((_ () (rest ...) #f #f) ;no 'title' and no 'device' field - (%file-system rest ...)) - ((_ () (rest ...) dev #f) ;no 'title' field - (%file-system rest ... (device dev))) - ((_ () (rest ...) dev titl) ;got a 'title' field - (%file-system rest ... - (device (device-expression titl dev)))) - ((_ ((title titl) rest ...) (previous ...) dev _) - (begin - (report-deprecation (title titl)) - (process-file-system-declaration (rest ...) - (previous ...) - dev titl))) - ((_ ((device dev) rest ...) (previous ...) _ titl) - (process-file-system-declaration (rest ...) - (previous ...) - dev titl)) - ((_ (field rest ...) (previous ...) dev titl) - (process-file-system-declaration (rest ...) - (previous ... field) - dev titl)))) - -(define-syntax-rule (file-system fields ...) - (process-file-system-declaration (fields ...) () #f #f)) - -(define (file-system-title fs) ;deprecated - (match (file-system-device fs) - ((? file-system-label?) 'label) - ((? uuid?) 'uuid) - ((? string?) 'device))) - ;; Note: This module is used both on the build side and on the host side. ;; Arrange not to pull (guix store) and (guix config) because the latter ;; differs from user to user. -- 2.39.1 From debbugs-submit-bounces@debbugs.gnu.org Sun Mar 05 17:05:57 2023 Received: (at 61842-done) by debbugs.gnu.org; 5 Mar 2023 22:05:57 +0000 Received: from localhost ([127.0.0.1]:40894 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pYwUP-0005lx-Bs for submit@debbugs.gnu.org; Sun, 05 Mar 2023 17:05:57 -0500 Received: from eggs.gnu.org ([209.51.188.92]:48770) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pYwUN-0005lh-Ph for 61842-done@debbugs.gnu.org; Sun, 05 Mar 2023 17:05:56 -0500 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pYwUF-0001j8-H2; Sun, 05 Mar 2023 17:05:49 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:In-Reply-To:Date:References:Subject:To: From; bh=L6f1ZV5HF1ChE5ZIHkFWnvhiQN6Z5bfydLkaBCA1LBw=; b=NmT9M9jQW/X1JAAAkcaC giI2WaMD2oH7C/JK8504qeO53Ae/6f4LZoE2n/eSs5167RJ4ppLoGWxIGQ+e00MtcsDZEdZPTOljp ZeDTAF87lqgBxraVK6DD6tZMqMXvmD7nSkVbuEEBp/xwbCOzZICxha2s5t+5kBIhk3Dlw2/XeEbpp wf0B+8mO18hFw5PmWEUdiBHwPQYFxbUtqiAzLyB9MSOKhrkGv8N2QAtImfpEXZkRnE3KJUkdHyKGh PIa051DD8CllbUzreW/tf6FckzYBsCdROVXaWUeKKe5fGYz6LSmURZNTwC83YbqnqDNlvYzbKpsZ3 ej3k89GuenyTtQ==; Received: from 91-160-117-201.subs.proxad.net ([91.160.117.201] helo=ribbon) by fencepost.gnu.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pYwUD-0003s1-SP; Sun, 05 Mar 2023 17:05:46 -0500 From: =?utf-8?Q?Ludovic_Court=C3=A8s?= To: Bruno Victal Subject: Re: bug#61842: [PATCH] file-systems: Remove deprecated 'title' field helper procedures. References: Date: Sun, 05 Mar 2023 23:05:43 +0100 In-Reply-To: (Bruno Victal's message of "Mon, 27 Feb 2023 14:59:39 +0000") Message-ID: <87jzzuonuw.fsf@gnu.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-Spam-Score: -2.3 (--) X-Debbugs-Envelope-To: 61842-done Cc: 61842-done@debbugs.gnu.org X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -3.3 (---) Hi, Bruno Victal skribis: > * gnu/system/file-systems.scm (): Change constructor name to= 'file-system'. > (report-deprecation, device-expression, process-file-system-declaration, = file-system): Remove macros. > (file-system-title): Remove procedure. Good riddance. :-) Applied, thanks! Ludo=E2=80=99. From unknown Sun Jul 27 08:11:15 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Mon, 03 Apr 2023 11:24:07 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator