From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id 95yTNWN4A2EsnAAAgWs5BA (envelope-from ) for ; Fri, 30 Jul 2021 05:56:19 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id cAetMGN4A2HFcgAAB5/wlQ (envelope-from ) for ; Fri, 30 Jul 2021 03:56:19 +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 8FC4C5708 for ; Fri, 30 Jul 2021 05:56:19 +0200 (CEST) Received: from localhost ([::1]:43044 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m9JdC-00075t-K8 for larch@yhetil.org; Thu, 29 Jul 2021 23:56:18 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59490) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m9Jcz-0006wU-NO for guix-patches@gnu.org; Thu, 29 Jul 2021 23:56:05 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:47157) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1m9Jcz-0006EK-Cr for guix-patches@gnu.org; Thu, 29 Jul 2021 23:56:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1m9Jcz-0003vz-C1 for guix-patches@gnu.org; Thu, 29 Jul 2021 23:56:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49780] [PATCH 11/14] import: crate: Use PARSE-COMMAND-LINE for options. Resent-From: Sarah Morgensen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 30 Jul 2021 03:56:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49780 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49780@debbugs.gnu.org Received: via spool by 49780-submit@debbugs.gnu.org id=B49780.162761734114993 (code B ref 49780); Fri, 30 Jul 2021 03:56:05 +0000 Received: (at 49780) by debbugs.gnu.org; 30 Jul 2021 03:55:41 +0000 Received: from localhost ([127.0.0.1]:58685 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m9Jcb-0003te-DG for submit@debbugs.gnu.org; Thu, 29 Jul 2021 23:55:41 -0400 Received: from out0.migadu.com ([94.23.1.103]:28507) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1m9JcX-0003tC-NO for 49780@debbugs.gnu.org; Thu, 29 Jul 2021 23:55:38 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=mgsn.dev; s=key1; t=1627617336; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=o7WdmX2OqSqfqCgDYP92Mde/VFiW2RW2sEhHXAXFGfA=; b=Xo1OgSv0QRONOgmlok+rZiLjvGuq4NwGqSlxKmtjNSa15mjkoO/dga7L8THC8O5aRxxT6R 4C6Nh1lJS4xFqp4O6cFE4/pu/dQ9DlzNFLs2rto1TYGOYuMswPpaVitoYIV5gaz28osZVZ XSv4D/J95oyRu8RRlqd3K5Gwap66fr0= From: Sarah Morgensen Date: Thu, 29 Jul 2021 20:55:07 -0700 Message-Id: <85674bf52bdbac917e5f68ca47c226ec5b2c3371.1627617006.git.iskarian@mgsn.dev> In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Migadu-Auth-User: iskarian@mgsn.dev 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=1627617379; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: 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:dkim-signature; bh=o7WdmX2OqSqfqCgDYP92Mde/VFiW2RW2sEhHXAXFGfA=; b=q/VbDtfXL22V53JeVeE+BERvaq7Q08tT9551rqMbioIStwXnbJlQ3L81JkFWdWjJlZrRjx zMemsaeqJysmnADsR7wZmZ0udF99DFxB0eaiZJuVLsgw9v3Lakw/jwR4Wzdr9Bpsduk4T0 Svj1KCeCmTmlUEidCLlIssbBSXfzeS02BEJ/Ck08XPKjPnErX5CcWh9F7HRLVCD26gp/QG sksmfLUJuFRHyoACANYc9INMpDGiQZ336zyAQP4Fjle0MxwcP9crvPTGA3CKEeFwfbHWZu cLkQyId7hrHYht60klHR//Ywnd0BeHFYW0qaXkCoRQ1LkDgru7cZFy4Ln91k+g== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1627617379; a=rsa-sha256; cv=none; b=G+zWQ0OjBxm8nSR00CruY2+3jgjn0bMcrWA/vhV17Zbh5zMgux+bivQEvXOLhpFhyKpLAn 1dqKe2sM2HYlWcJyMri1fSkIj9lbDAH1vmfgvm2zmNs1DKbRucgWHFmnk7Io+XOqsRlA7e u/MUWGVp6KzrFF/86uJFCVNTOS+r6qmhR4Q2n/UTqTrVxYGF7BoSL3UPrZlExrvHB4tbbT JBkTpnmM9Aixf/laTcvlU/k5W3lG+tSu6NBjYCA+ntbOHYi+3HIrBPba1OXi61YUVIr+MD PCzgvokmnis8mrEiQbpL0GqvtcerEl66A6J5en55pQDbiejb/7hXJVeRK/4vgQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mgsn.dev header.s=key1 header.b=Xo1OgSv0; dmarc=fail reason="SPF not aligned (relaxed)" header.from=mgsn.dev (policy=none); 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: -0.31 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=mgsn.dev header.s=key1 header.b=Xo1OgSv0; dmarc=fail reason="SPF not aligned (relaxed)" header.from=mgsn.dev (policy=none); 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: 8FC4C5708 X-Spam-Score: -0.31 X-Migadu-Scanner: scn1.migadu.com X-TUID: /IaSaGb4zGvW guix/scripts/import/crate.scm (guix-import-crate)[parse-options]: Use PARSE-COMMAND-LINE instead of ARGS-FOLD*. --- guix/scripts/import/crate.scm | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/guix/scripts/import/crate.scm b/guix/scripts/import/crate.scm index 3a96defb86..97152904ac 100644 --- a/guix/scripts/import/crate.scm +++ b/guix/scripts/import/crate.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2014 David Thompson ;;; Copyright © 2016 David Craven ;;; Copyright © 2019, 2020 Martin Becze +;;; Copyright © 2021 Sarah Morgensen ;;; ;;; This file is part of GNU Guix. ;;; @@ -75,13 +76,8 @@ Import and convert the crates.io package for PACKAGE-NAME.\n")) (define (guix-import-crate . args) (define (parse-options) ;; Return the alist of option values. - (args-fold* args %options - (lambda (opt name arg result) - (leave (G_ "~A: unrecognized option~%") name)) - (lambda (arg result) - (alist-cons 'argument arg result)) - %default-options)) - + (parse-command-line args %options (list %default-options) + #:build-options? #f)) (let* ((opts (parse-options)) (args (filter-map (match-lambda -- 2.31.1