scripts: system: Remove unused syntax.

* guix/scripts/system.scm (save-environment-excursion): Remove syntax.
* tests/profiles.scm (with-environment-excursion): Prepare syntax for reuse.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
Modified-by: Ludovic Courtès <ludo@gnu.org>
Merges: #10134

2 files changed, 4 insertions, 13 deletions

diff --git a/guix/scripts/system.scm b/guix/scripts/system.scm
index b9c60918f36..8277e24e5f7 100644
--- a/guix/scripts/system.scm
+++ b/guix/scripts/system.scm
@@ -133,20 +133,9 @@ BODY..., and restore them."
         (set! %load-path path)
         (set! %load-compiled-path cpath)))))
 
-(define-syntax-rule (save-environment-excursion body ...)
-  "Save the current environment variables, run BODY..., and restore them."
-  (let ((env (environ)))
-    (dynamic-wind
-      (const #t)
-      (lambda ()
-        body ...)
-      (lambda ()
-        (environ env)))))
-
 (define topologically-sorted*
   (store-lift topologically-sorted))
 
-
 (define* (copy-item item info target db
                     #:key (log-port (current-error-port)))
   "Copy ITEM to the store under root directory TARGET and populate DB with the
diff --git a/tests/profiles.scm b/tests/profiles.scm
index 55e7146a7a0..e2472aa9e85 100644
--- a/tests/profiles.scm
+++ b/tests/profiles.scm
@@ -367,11 +367,13 @@
        (profile -> (derivation->output-path drv))
        (bindir ->  (string-append profile "/bin"))
        (_          (built-derivations (list drv))))
-    (define-syntax-rule (with-environment-excursion exp ...)
+    (define-syntax-rule (with-environment-excursion body ...)
+      ;; Save the current environment variables, run BODY..., and restore
+      ;; them.
       (let ((env (environ)))
         (dynamic-wind
           (const #t)
-          (lambda () exp ...)
+          (lambda () body ...)
           (lambda () (environ env)))))
 
     (return (and (with-environment-excursion