ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2025-01-24 03:29:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

services: configuration: Change the value of the unset marker.

Browse source 
The new value of %unset-value sticks out more when something goes wrong, and
is also more unique; i.e. easier to search for.

Signed-off-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
This commit is contained in:
Attila Lendvai 2022-08-24 14:40:42 +02:00 committed by Maxim Cournoyer
parent ee08277a70
commit 6fb9759ef3
No known key found for this signature in database
GPG key ID: 1260E46482E63562
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gnu/services/configuration.scm
View file

@ -305,12 +305,13 @@ (define serialize-package empty-serializer)
;; Ideally this should be an implementation detail, but we export it ;; Ideally this should be an implementation detail, but we export it
;; to provide a simpler API that enables unsetting a configuration ;; to provide a simpler API that enables unsetting a configuration
;; field that has a maybe type, but also a default value. ;; field that has a maybe type, but also a default value. We give it
;; a value that sticks out to the reader when something goes wrong.
;; ;;
;; An example use-case would be something like a network application ;; An example use-case would be something like a network application
;; that uses a default port, but the field can explicitly be unset to ;; that uses a default port, but the field can explicitly be unset to
;; request a random port at startup. ;; request a random port at startup.
(define %unset-value 'unset) (define %unset-value '%unset-marker%)
(define (maybe-value-set? value) (define (maybe-value-set? value)
"Predicate to check whether a 'maybe' value was explicitly provided." "Predicate to check whether a 'maybe' value was explicitly provided."

2
gnu/services/messaging.scm
View file

@ -95,7 +95,7 @@ (define (make-pred arg)
;; doesn't interfere with ;; doesn't interfere with
;; define-configuration and define-maybe ;; define-configuration and define-maybe
;; internals. ;; internals.
#''unset def)) #''%unset-marker% def))
#'(def ...) #'(target ...))) #'(def ...) #'(target ...)))
((new-doc ...) ((new-doc ...)
(map (lambda (doc target) (map (lambda (doc target)

2
tests/services/configuration.scm
View file

@ -150,7 +150,7 @@ (define-configuration config-with-maybe-symbol
(protocol maybe-symbol "")) (protocol maybe-symbol ""))
;;; Maybe symbol values are currently seen as serializable, because the ;;; Maybe symbol values are currently seen as serializable, because the
;;; unspecified value is 'unset, which is a symbol itself. ;;; unspecified value is '%unset-marker%, which is a symbol itself.
;;; TODO: Remove expected fail marker after resolution. ;;; TODO: Remove expected fail marker after resolution.
(test-expect-fail 1) (test-expect-fail 1)
(test-equal "symbol maybe value serialization, unspecified" (test-equal "symbol maybe value serialization, unspecified"