Fix environment variable setting for go and rust layers

layers/+distributions/spacemacs-bootstrap/funcs.el

@@ -180,3 +180,11 @@ Example: (evil-map visual \"<\" \"<gv\")"
   "Custom hint documentation format for keys."
   (format (format "[%%%ds] %%%ds" key-width (- -1 doc-width))
           key doc))
+
+
+
+(defun spacemacs/copy-env-list (vars)
+  "Copy list of env. VARS using `exec-path-from-shell'."
+  (dolist (var vars)
+    (unless (getenv var)
+      (exec-path-from-shell-copy-env var))))

layers/+lang/go/packages.el

@@ -19,7 +19,6 @@
                                              'flycheck)))
         ggtags
         helm-gtags
-        exec-path-from-shell
         go-eldoc
         go-fill-struct
         go-gen-test
@@ -57,14 +56,6 @@
 (defun go/post-init-helm-gtags ()
   (spacemacs/helm-gtags-define-keys-for-mode 'go-mode))
 
-(defun go/pre-init-exec-path-from-shell ()
-  (spacemacs|use-package-add-hook exec-path-from-shell
-    :pre-config
-    (dolist (var '("GOPATH" "GOROOT" "GO15VENDOREXPERIMENT")
-                 exec-path-from-shell-variables)
-      (unless (or (member var exec-path-from-shell-variables) (getenv var))
-        (add-to-list 'exec-path-from-shell-variables var)))))
-
 (defun go/init-go-eldoc ()
   (add-hook 'go-mode-hook 'go-eldoc-setup))
 
@@ -117,7 +108,8 @@
     (progn
       ;; get go packages much faster
       (setq go-packages-function 'spacemacs/go-packages-gopkgs)
-      (add-hook 'go-mode-hook 'spacemacs//go-set-tab-width))
+      (add-hook 'go-mode-hook 'spacemacs//go-set-tab-width)
+      (spacemacs/copy-env-list '("GOPATH" "GOROOT" "GO15VENDOREXPERIMENT")))
     :config
     (progn
       (add-hook 'before-save-hook 'gofmt-before-save)

layers/+lang/rust/packages.el

@@ -18,7 +18,6 @@
     flycheck
     (flycheck-rust :requires flycheck)
     ggtags
-    exec-path-from-shell
     helm-gtags
     rust-mode
     smartparens
@@ -73,6 +72,7 @@
     :defer t
     :init
     (progn
+      (spacemacs/copy-env-list '("RUST_SRC_PATH"))
       (spacemacs/set-leader-keys-for-major-mode 'rust-mode
         "=" 'rust-format-buffer
         "q" 'spacemacs/rust-quick-run))))
@@ -92,14 +92,6 @@
     ;; Don't pair lifetime specifiers
     (sp-local-pair 'rust-mode "'" nil :actions nil)))
 
-
-(defun rust/pre-init-exec-path-from-shell ()
-  (spacemacs|use-package-add-hook exec-path-from-shell
-    :pre-config
-    (let ((var "RUST_SRC_PATH"))
-      (unless (or (member var exec-path-from-shell-variables) (getenv var))
-        (add-to-list 'exec-path-from-shell-variables var)))))
-
 (defun rust/init-racer ()
   (use-package racer
     :defer t