refactor: remove [Dune_env.Stanza] submodule (#9361)

Just adds a useless extra layer Signed-off-by: Rudi Grinberg <[email protected]>
ocaml · Dec 3, 2023 · a97b394 · a97b394
1 parent 927aff3
commit a97b394
Show file tree

Hide file tree

Showing 10 changed files with 385 additions and 399 deletions.
diff --git a/src/dune_rules/context.ml b/src/dune_rules/context.ml
@@ -48,8 +48,8 @@ end
 
 module Env_nodes = struct
   type t =
-    { context : Dune_env.Stanza.t option
-    ; workspace : Dune_env.Stanza.t option
+    { context : Dune_env.t option
+    ; workspace : Dune_env.t option
     }
 
   let empty = { context = None; workspace = None }
@@ -59,9 +59,7 @@ module Env_nodes = struct
       Option.value
         ~default:Env.empty
         (let open Option.O in
-         let+ (env : Dune_env.Stanza.config) =
-           env >>= Dune_env.Stanza.find_opt ~profile
-         in
+         let+ (env : Dune_env.config) = env >>= Dune_env.find_opt ~profile in
          env.env_vars)
     in
     Env.extend_env (make context) (make workspace)

diff --git a/src/dune_rules/context.mli b/src/dune_rules/context.mli
@@ -30,8 +30,8 @@ end
 
 module Env_nodes : sig
   type t =
-    { context : Dune_env.Stanza.t option
-    ; workspace : Dune_env.Stanza.t option
+    { context : Dune_env.t option
+    ; workspace : Dune_env.t option
     }
 end