rust: Use with-store macro instead of manual conn handling

env/rust.scm

@@ -69,7 +69,7 @@
                           0 7))
       (item rustup-init-script-derivation)))))
 
-(define* (exec-in-rustup-environment store launch cmd #:optional home)
+(define* (exec-in-rustup-environment launch cmd #:optional home)
   (let* ((mappings  (if home
                         (list
                          (file-system-mapping
@@ -77,6 +77,7 @@
                           (target "/home/rustup")
                           (writable? #t)))
                         '())))
+    (with-store store
       (run-with-store store
         (mlet* %store-monad ((bash (package->derivation bash))
                              (profile (profile-derivation
@@ -96,16 +97,15 @@
                       #:network? #t
                       #:map-cwd? #f
                       #:emulate-fhs? #t
-                    #:nesting? #f)))))))
+                      #:nesting? #f))))))))
 
 (define (call-with-guix-shell-hacks proc)
   "Overcome several pitfails calling launch-environment/container procedure we
-aren't supposed to.  PROC is passed store connection and
-launch-environment/container function."
+aren't supposed to.  PROC is passed curried launch-environment/container
+function."
   (let* ((_         (reload-module (resolve-module '(guix scripts environment))))
          (launch    (@@ (guix scripts environment) launch-environment/container))
          (setup-fhs (@@ (guix scripts environment) setup-fhs))
-         (store     (open-connection))
          (tcgrp (tcgetpgrp (current-input-port))))
     ;; during launch-environment/container does at least one fork take place,
     ;; for some reason when child exits this process receives SIGTTOU and
@@ -113,14 +113,11 @@ launch-environment/container function."
     ;; inside script folder or linux-container module.
     (sigaction SIGTTOU SIG_IGN)
     (sigaction SIGTTIN SIG_IGN)
-    (dynamic-wind
-      (const #t)
-      (λ ()
     (match (primitive-fork)
       (0
        (catch 'system-error
          (λ ()
-               (proc store
+           (proc
             ;; Curried launch function with setup-hook = setup-fhs
             (λ args
               (apply
@@ -137,17 +134,18 @@ launch-environment/container function."
            ;; the prompt.
            (tcsetpgrp (current-input-port) tcgrp)
            ;; Why not?
-               (flush-all-ports))))
-      (λ () (close-connection store)))))
+           (flush-all-ports)))))
 
 (define* (init-rustup-environment #:optional home)
   (call-with-guix-shell-hacks
-   (λ (store launch)
-     (exec-in-rustup-environment
-      store launch'("rustup-init.sh" "-q" "-y") home))))
+   (λ (launch)
+     (exec-in-rustup-environment launch
+                                 '("rustup-init.sh" "-q" "-y")
+                                 home))))
 
 (define* (launch-rustup-environment #:optional home)
   (call-with-guix-shell-hacks
-   (λ (store launch)
-     (exec-in-rustup-environment
-      store launch '("/bin/sh") home))))
+   (λ (launch)
+     (exec-in-rustup-environment launch
+                                 '("/bin/sh")
+                                 home))))