nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Ludovic Courtès 2017-03-08 21:36:54 +01:00
parent 3f6d5b8a69
commit 30906825cb
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
guix/ui.scm
View File

@ -687,7 +687,7 @@ replacement if PORT is not Unicode-capable."
"The following packages will be removed:~%~{~a~%~}~%" "The following packages will be removed:~%~{~a~%~}~%"
len) len)
remove)))) remove))))
(_ #f)) (x #f))
(match downgrade (match downgrade
(((($ <manifest-entry> name old-version) (((($ <manifest-entry> name old-version)
. ($ <manifest-entry> _ new-version output item)) ..1) . ($ <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~%~}~%" "The following packages will be downgraded:~%~{~a~%~}~%"
len) len)
downgrade)))) downgrade))))
(_ #f)) (x #f))
(match upgrade (match upgrade
(((($ <manifest-entry> name old-version) (((($ <manifest-entry> name old-version)
. ($ <manifest-entry> _ new-version output item)) ..1) . ($ <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~%~}~%" "The following packages will be upgraded:~%~{~a~%~}~%"
len) len)
upgrade)))) upgrade))))
(_ #f)) (x #f))
(match install (match install
((($ <manifest-entry> name version output item _) ..1) ((($ <manifest-entry> name version output item _) ..1)
(let ((len (length name)) (let ((len (length name))
@ -739,7 +739,7 @@ replacement if PORT is not Unicode-capable."
"The following packages will be installed:~%~{~a~%~}~%" "The following packages will be installed:~%~{~a~%~}~%"
len) len)
install)))) install))))
(_ #f)))) (x #f))))
(define-syntax with-error-handling (define-syntax with-error-handling
(syntax-rules () (syntax-rules ()
@ -820,7 +820,7 @@ converted to a space; sequences of more than one line break are preserved."
(match (string-fold maybe-break (match (string-fold maybe-break
`(,column 0 ()) `(,column 0 ())
str) str)
((_ _ chars) ((column newlines chars)
(list->string (reverse chars))))) (list->string (reverse chars)))))
@ -1024,7 +1024,7 @@ DURATION-RELATION with the current time."
(valid-generations (iota n 1))) (valid-generations (iota n 1)))
((lst ..1) ((lst ..1)
(valid-generations lst)) (valid-generations lst))
(_ #f))) (x #f)))
(define (filter-by-duration duration) (define (filter-by-duration duration)
(define (time-at-midnight time) (define (time-at-midnight time)