summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2017-03-08 21:36:54 +0100
committerLudovic Courtès <ludo@gnu.org>2017-03-08 23:42:53 +0100
commit30906825cb99122f6b068a1d9223937757d75ce5 (patch)
treee0e4e6ed1fe69992a516bf29c790f82df7f9f6d7
parent3f6d5b8a691fee5574efd3e13f88201ea5c3b416 (diff)
ui: Avoid '_' as a pattern variable in 'match'.
* guix/ui.scm (fill-paragraph): Don't use '_' as a pattern variable since that is shadowed by the top-level '_' binding on Guile 2.2. (show-manifest-transaction): Likewise.
-rw-r--r--guix/ui.scm12
1 files changed, 6 insertions, 6 deletions
diff --git a/guix/ui.scm b/guix/ui.scm
index 6247944068..5ae082fc0a 100644
--- a/guix/ui.scm
+++ b/guix/ui.scm
@@ -687,7 +687,7 @@ replacement if PORT is not Unicode-capable."
"The following packages will be removed:~%~{~a~%~}~%"
len)
remove))))
- (_ #f))
+ (x #f))
(match downgrade
(((($ <manifest-entry> name old-version)
. ($ <manifest-entry> _ new-version output item)) ..1)
@@ -705,7 +705,7 @@ replacement if PORT is not Unicode-capable."
"The following packages will be downgraded:~%~{~a~%~}~%"
len)
downgrade))))
- (_ #f))
+ (x #f))
(match upgrade
(((($ <manifest-entry> name old-version)
. ($ <manifest-entry> _ new-version output item)) ..1)
@@ -723,7 +723,7 @@ replacement if PORT is not Unicode-capable."
"The following packages will be upgraded:~%~{~a~%~}~%"
len)
upgrade))))
- (_ #f))
+ (x #f))
(match install
((($ <manifest-entry> name version output item _) ..1)
(let ((len (length name))
@@ -739,7 +739,7 @@ replacement if PORT is not Unicode-capable."
"The following packages will be installed:~%~{~a~%~}~%"
len)
install))))
- (_ #f))))
+ (x #f))))
(define-syntax with-error-handling
(syntax-rules ()
@@ -820,7 +820,7 @@ converted to a space; sequences of more than one line break are preserved."
(match (string-fold maybe-break
`(,column 0 ())
str)
- ((_ _ chars)
+ ((column newlines chars)
(list->string (reverse chars)))))
@@ -1024,7 +1024,7 @@ DURATION-RELATION with the current time."
(valid-generations (iota n 1)))
((lst ..1)
(valid-generations lst))
- (_ #f)))
+ (x #f)))
(define (filter-by-duration duration)
(define (time-at-midnight time)