refactor: move standard aliases to rules (#11030)

Signed-off-by: Rudi Grinberg <[email protected]>

Author: rgrinberg

bin/alias.ml

@@ -1,5 +1,6 @@
 open Import
 module Alias = Dune_engine.Alias
+module Alias0 = Dune_rules.Alias
 module Alias_builder = Dune_rules.Alias_builder
 
 type t =
@@ -96,7 +97,7 @@ let dep_on_alias_rec_multi_contexts ~dir:src_dir ~name ~contexts =
          Dune_rules.Alias_rec.dep_on_alias_rec name dir))
   in
   match
-    Alias.is_standard name
+    Alias0.is_standard name
     || List.exists alias_statuses ~f:(fun (x : Alias_builder.Alias_status.t) ->
       match x with
       | Defined -> true

src/dune_engine/alias.ml

@@ -78,22 +78,6 @@ let name t = t.name
 let dir t = t.dir
 let fully_qualified_name t = Path.Build.relative t.dir (Name.to_string t.name)
 
-(* This mutable table is safe: it's modified only at the top level. *)
-let standard_aliases = Table.create (module Name) 7
-let is_standard name = Table.mem standard_aliases name
-
-let make_standard name =
-  Table.add_exn standard_aliases name ();
-  make name
-;;
-
-let register_as_standard name =
-  let (_ : (unit, _) result) = Table.add standard_aliases name () in
-  ()
-;;
-
-let default = make_standard Name.default
-
 let get_ctx (path : Path.Build.t) =
   match Path.Build.extract_first_component path with
   | None -> None

src/dune_engine/alias.mli

@@ -15,7 +15,6 @@ val equal : t -> t -> bool
 val hash : t -> int
 val compare : t -> t -> Ordering.t
 val make : Name.t -> dir:Path.Build.t -> t
-val register_as_standard : Name.t -> unit
 
 (** The following always holds: [make (name t) ~dir:(dir t) = t] *)
 val name : t -> Name.t
@@ -24,6 +23,4 @@ val dir : t -> Path.Build.t
 val to_dyn : t -> Dyn.t
 val of_user_written_path : loc:Loc.t -> Path.t -> t
 val fully_qualified_name : t -> Path.Build.t
-val default : dir:Path.Build.t -> t
-val is_standard : Name.t -> bool
 val describe : ?loc:Loc.t -> t -> _ Pp.t

src/dune_rules/alias0.ml

@@ -1,8 +1,17 @@
 open Import
 
+(* This mutable table is safe: it's modified only at the top level. *)
+let standard_aliases = Table.create (module Dune_engine.Alias.Name) 7
+let is_standard name = Table.mem standard_aliases name
+
+let register_as_standard name =
+  let (_ : (unit, _) result) = Table.add standard_aliases name () in
+  ()
+;;
+
 let standard name =
   let name = Alias.Name.of_string name in
-  Alias.register_as_standard name;
+  register_as_standard name;
   name
 ;;
 

src/dune_rules/alias0.mli

@@ -15,3 +15,5 @@ val ocaml_index : Name.t
 val install : Name.t
 val runtest : Name.t
 val all : Name.t
+val is_standard : Name.t -> bool
+val register_as_standard : Name.t -> unit

src/dune_rules/dep_conf_eval.ml

@@ -63,7 +63,7 @@ let dep_on_alias_rec alias ~loc =
     >>| (function
      | Defined -> ()
      | Not_defined ->
-       if not (Alias.is_standard name)
+       if not (Alias0.is_standard name)
        then
          User_error.raise
            ~loc

src/dune_rules/jsoo/js_of_ocaml.ml

@@ -214,7 +214,7 @@ module Env = struct
            (Dune_lang.Syntax.since Stanza.syntax (3, 17) >>> Sourcemap.decode)
        and+ runtest_alias = field_o "runtest_alias" Dune_lang.Alias.decode
        and+ flags = Flags.decode in
-       Option.iter ~f:Alias.register_as_standard runtest_alias;
+       Option.iter ~f:Alias0.register_as_standard runtest_alias;
        { compilation_mode; sourcemap; runtest_alias; flags }
   ;;