Add alias for compound_user_error in the engine

Signed-off-by: Ambre Austen Suhamy <[email protected]>

Author: ElectreAAS

src/dune_engine/build_system_error.ml

@@ -8,7 +8,7 @@ type t =
       }
   | Diagnostic of
       { id : Id.t
-      ; diagnostic : Dune_rpc_private.Compound_user_error.t
+      ; diagnostic : Compound_user_error.t
       ; dir : Path.t option
       ; promotion : Diff_promotion.Annot.t option
       }
@@ -29,14 +29,12 @@ let of_exn (exn : Exn_with_backtrace.t) =
   | User_error.E main ->
     let dir = Option.map ~f:Path.of_string main.dir in
     let promotion = User_message.Annots.find main.annots Diff_promotion.Annot.annot in
-    (match
-       User_message.Annots.find main.annots Dune_rpc_private.Compound_user_error.annot
-     with
+    (match User_message.Annots.find main.annots Compound_user_error.annot with
      | None ->
        [ Diagnostic
            { dir
            ; id = Id.gen ()
-           ; diagnostic = Dune_rpc_private.Compound_user_error.make ~main ~related:[]
+           ; diagnostic = Compound_user_error.make ~main ~related:[]
            ; promotion
            }
        ]

src/dune_engine/build_system_error.mli

@@ -26,9 +26,7 @@ val dir : t -> Path.t option
     metadata that are extracted into [`Diagnostic] *)
 val description
   :  t
-  -> [ `Exn of Exn_with_backtrace.t
-     | `Diagnostic of Dune_rpc_private.Compound_user_error.t
-     ]
+  -> [ `Exn of Exn_with_backtrace.t | `Diagnostic of Compound_user_error.t ]
 
 val promotion : t -> Diff_promotion.Annot.t option
 
@@ -58,10 +56,7 @@ module For_tests : sig
 
   (** Construct an [Error.t] *)
   val make
-    :  description:
-         [ `Exn of Exn_with_backtrace.t
-         | `Diagnostic of Dune_rpc_private.Compound_user_error.t
-         ]
+    :  description:[ `Exn of Exn_with_backtrace.t | `Diagnostic of Compound_user_error.t ]
     -> dir:Path.t option
     -> promotion:Diff_promotion.Annot.t option
     -> unit

src/dune_engine/import.ml

@@ -4,6 +4,7 @@ module Cached_digest = Dune_digest.Cached_digest
 module Console = Dune_console
 module Metrics = Dune_metrics
 module Log = Dune_util.Log
+module Compound_user_error = Dune_rpc_private.Compound_user_error
 module Stringlike = Dune_util.Stringlike
 
 module type Stringlike = Dune_util.Stringlike

src/dune_engine/process.ml

@@ -539,15 +539,9 @@ end = struct
           let annots =
             User_message.Annots.set annots User_message.Annots.has_embedded_location ()
           in
-          match
-            Dune_rpc_private.Compound_user_error.parse_output ~dir output.without_color
-          with
+          match Compound_user_error.parse_output ~dir output.without_color with
           | [] -> annots
-          | errors ->
-            User_message.Annots.set
-              annots
-              Dune_rpc_private.Compound_user_error.annot
-              errors)
+          | errors -> User_message.Annots.set annots Compound_user_error.annot errors)
         else annots
     in
     loc, annots, dir