Use a warning constructor instead of modifying 15 files

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

Author: ElectreAAS

otherlibs/dune-rpc/private/exported_types.ml

@@ -752,7 +752,8 @@ module Compound_user_error = struct
     Stdune.User_message.Annots.Key.create ~name:"compound-user-error" (Dyn.list to_dyn)
   ;;
 
-  let make ~main ~related ~severity = create ~main ~related ~severity
+  let make ~main ~related = create ~main ~related ~severity:Error
+  let make_with_severity ~main ~related ~severity = create ~main ~related ~severity
 
   let make_loc ~dir { Ocamlc_loc.path; chars; lines } : Stdune.Loc.t =
     let pos_fname =
@@ -793,7 +794,7 @@ module Compound_user_error = struct
           (* FIXME: tests expect this, but it's unclear if that should change. *)
           Error
       in
-      make ~main ~related ~severity)
+      make_with_severity ~main ~related ~severity)
   ;;
 end
 

otherlibs/dune-rpc/private/exported_types.mli

@@ -234,7 +234,10 @@ module Compound_user_error : sig
   val to_dyn : t -> Dyn.t
   val annot : t list Stdune.User_message.Annots.Key.t
 
-  val make
+  (** Make a [t] with severity as [Error]. *)
+  val make : main:User_message.t -> related:User_message.t list -> t
+
+  val make_with_severity
     :  main:User_message.t
     -> related:User_message.t list
     -> severity:Diagnostic.severity

src/dune_engine/build_system_error.ml

@@ -34,11 +34,7 @@ let of_exn (exn : Exn_with_backtrace.t) =
        [ Diagnostic
            { dir
            ; id = Id.gen ()
-           ; diagnostic =
-               Compound_user_error.make
-                 ~main
-                 ~related:[]
-                 ~severity:Dune_rpc_private.Diagnostic.Error
+           ; diagnostic = Compound_user_error.make ~main ~related:[]
            ; promotion
            }
        ]

src/dune_lang/dune_project.ml

@@ -788,11 +788,7 @@ let make_packages
        let related = [ message loc1; message loc2 ] in
        User_message.Annots.singleton
          Compound_user_error.annot
-         [ Compound_user_error.make
-             ~main:(User_message.make main_message)
-             ~related
-             ~severity:Dune_rpc_private.Diagnostic.Error
-         ]
+         [ Compound_user_error.make ~main:(User_message.make main_message) ~related ]
      in
      User_error.raise
        ~annots

src/dune_rpc_impl/server.ml

@@ -436,7 +436,7 @@ let handler (t : _ t Fdecl.t) handle : 'build_arg Dune_rpc_server.Handler.t =
       | missing ->
         let warnings =
           List.map missing ~f:(fun fn ->
-            Dune_rpc.Compound_user_error.make
+            Dune_rpc.Compound_user_error.make_with_severity
               ~main:
                 (User_message.make
                    [ Pp.paragraphf

src/dune_rules/cram/cram_rules.ml

@@ -266,7 +266,7 @@ let rules ~sctx ~dir tests =
                        in
                        User_message.Annots.singleton
                          Compound_user_error.annot
-                         [ Compound_user_error.make ~main ~related ~severity:Error ]
+                         [ Compound_user_error.make ~main ~related ]
                      in
                      User_error.raise
                        ~annots

src/dune_rules/foreign.ml

@@ -215,7 +215,7 @@ module Objects = struct
         let related = [ User_message.make ~loc:loc' [ Pp.text "" ] ] in
         User_message.Annots.singleton
           Compound_user_error.annot
-          [ Compound_user_error.make ~main ~related ~severity:Error ]
+          [ Compound_user_error.make ~main ~related ]
       in
       User_error.raise
         ~loc

src/dune_rules/foreign_sources.ml

@@ -260,7 +260,7 @@ let make stanzas ~(sources : Unresolved.t) ~dune_version =
         in
         User_message.Annots.singleton
           Compound_user_error.annot
-          [ Compound_user_error.make ~main ~related ~severity:Error ]
+          [ Compound_user_error.make ~main ~related ]
       in
       User_error.raise
         ~loc
@@ -318,7 +318,7 @@ let make stanzas ~(sources : Unresolved.t) ~dune_version =
           in
           User_message.Annots.singleton
             Compound_user_error.annot
-            [ Compound_user_error.make ~main ~related ~severity:Error ]
+            [ Compound_user_error.make ~main ~related ]
         in
         User_error.raise
           ~annots

src/dune_rules/melange/melange_rules.ml

@@ -960,7 +960,7 @@ let gen_emit_rules sctx ~dir ({ stanza_dir; stanza } as for_melange) =
          in
          User_message.Annots.singleton
            Compound_user_error.annot
-           [ Compound_user_error.make ~main ~related ~severity:Error ]
+           [ Compound_user_error.make ~main ~related ]
        in
        User_error.raise
          ~loc:stanza.loc

src/dune_rules/melange/melange_stanzas.ml

@@ -70,7 +70,7 @@ module Emit = struct
             in
             User_message.Annots.singleton
               Compound_user_error.annot
-              [ Compound_user_error.make ~main ~related ~severity:Error ]
+              [ Compound_user_error.make ~main ~related ]
           in
           User_error.raise
             ~annots