repl, marionette: 'self-quoting?' matches keywords.

* guix/repl.scm (self-quoting?): Add 'keyword?' and 'array?'; remove
'vector?' and 'bytevector?'.
* gnu/tests.scm (marionette-shepherd-service) <start>: Likewise.
<modules>: Remove (rnrs bytevector).

2 files changed, 5 insertions, 8 deletions

diff --git a/gnu/tests.scm b/gnu/tests.scm
index 0871b4c6f77..27cb39c2b99 100644
--- a/gnu/tests.scm
+++ b/gnu/tests.scm
@@ -87,8 +87,7 @@
             (requirement `(udev ,@requirement))
 
             (modules '((ice-9 match)
-                       (srfi srfi-9 gnu)
-                       (rnrs bytevectors)))
+                       (srfi srfi-9 gnu)))
             (start
              (with-imported-modules imported-modules
                #~(lambda ()
@@ -98,8 +97,8 @@
                                                ((_ pred rest ...)
                                                 (or (pred x)
                                                     (one-of rest ...))))))
-                       (one-of symbol? string? pair? null? vector?
-                               bytevector? number? boolean?)))
+                       (one-of symbol? string? keyword? pair? null? array?
+                               number? boolean?)))
 
                    (match (primitive-fork)
                      (0
diff --git a/guix/repl.scm b/guix/repl.scm
index 5cff5c71e92..1ead18c53b3 100644
--- a/guix/repl.scm
+++ b/guix/repl.scm
@@ -17,7 +17,6 @@
 ;;; along with GNU Guix.  If not, see <http://www.gnu.org/licenses/>.
 
 (define-module (guix repl)
-  #:use-module (rnrs bytevectors)
   #:use-module (ice-9 match)
   #:export (send-repl-response
             machine-repl))
@@ -37,9 +36,8 @@
                             ((_ pred rest ...)
                              (or (pred x)
                                  (one-of rest ...))))))
-    (one-of symbol? string? pair? null? vector?
-            bytevector? number? boolean?)))
-
+    (one-of symbol? string? keyword? pair? null? array?
+            number? boolean?)))
 
 (define (send-repl-response exp output)
   "Write the response corresponding to the evaluation of EXP to PORT, an