From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Kost Subject: [PATCH 1/4] emacs: Stylistic improvements in guile code. Date: Fri, 1 Apr 2016 11:06:39 +0300 Message-ID: <1459498002-3872-2-git-send-email-alezost@gmail.com> References: <1459498002-3872-1-git-send-email-alezost@gmail.com> Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:47908) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1alu6h-0007uJ-4i for guix-devel@gnu.org; Fri, 01 Apr 2016 04:07:03 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1alu6e-0000SJ-Hc for guix-devel@gnu.org; Fri, 01 Apr 2016 04:07:03 -0400 Received: from mail-lf0-x243.google.com ([2a00:1450:4010:c07::243]:35846) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1alu6e-0000S8-9t for guix-devel@gnu.org; Fri, 01 Apr 2016 04:07:00 -0400 Received: by mail-lf0-x243.google.com with SMTP id p81so4771058lfb.3 for ; Fri, 01 Apr 2016 01:07:00 -0700 (PDT) Received: from localhost.localdomain ([217.107.192.146]) by smtp.gmail.com with ESMTPSA id e66sm1974222lfg.23.2016.04.01.01.06.58 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 01 Apr 2016 01:06:59 -0700 (PDT) In-Reply-To: <1459498002-3872-1-git-send-email-alezost@gmail.com> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org To: guix-devel@gnu.org * emacs/guix-main.scm (package-unique?): Use 'match' instead of 'cdr'. (package-by-address): Likewise. --- emacs/guix-main.scm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/emacs/guix-main.scm b/emacs/guix-main.scm index bcff9ce..da42450 100644 --- a/emacs/guix-main.scm +++ b/emacs/guix-main.scm @@ -293,8 +293,10 @@ Example: (define (package-unique? package) "Return #t if PACKAGE is a single package with such name/version." - (null? (cdr (packages-by-name (package-name package) - (package-version package))))) + (match (packages-by-name (package-name package) + (package-version package)) + ((package) #t) + (_ #f))) (define %package-param-alist `((id . ,object-address) @@ -330,8 +332,9 @@ Example: ;;; Finding packages. (define (package-by-address address) - (and=> (vhash-assq address %packages) - cdr)) + (match (vhash-assq address %packages) + ((_ . package) package) + (_ #f))) (define (packages-by-name+version name version) (or (hash-ref %package-table -- 2.7.3