From f1f09937a683eeeff48310c6ee713398b5a2c78b Mon Sep 17 00:00:00 2001 From: Alex Kost Date: Thu, 31 Mar 2016 21:29:27 +0300 Subject: emacs: Stylistic improvements in guile code. * 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(-) (limited to 'emacs/guix-main.scm') diff --git a/emacs/guix-main.scm b/emacs/guix-main.scm index bcff9ce985..da42450d80 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 -- cgit v1.2.3