Label boolean argument for loading functions

panglesd · jonludlam · commit 6a3ed6404a72 · 2024-12-13T12:19:21.000Z
diff --git a/src/loader/cmi.ml b/src/loader/cmi.ml
@@ -1171,7 +1171,7 @@ and read_signature env parent (items : Odoc_model.Compat.signature) =
   fst @@ read_signature_noenv env parent items
 
 
-let read_interface root name suppress_warnings intf =
+let read_interface root name ~suppress_warnings intf =
   let id =
     Identifier.Mk.root (root, Odoc_model.Names.ModuleName.make_std name)
   in
diff --git a/src/loader/cmi.mli b/src/loader/cmi.mli
@@ -27,7 +27,7 @@ type env = {
 val read_interface :
   Odoc_model.Paths.Identifier.ContainerPage.t option ->
   string ->
-  bool ->
+  suppress_warnings:bool ->
   Odoc_model.Compat.signature ->
   Paths.Identifier.RootModule.t * Odoc_model.Lang.Signature.t
 
diff --git a/src/loader/cmt.ml b/src/loader/cmt.ml
@@ -616,7 +616,7 @@ and read_structure :
   | _ ->
     ({ Signature.items = Comment (`Docs doc_post) :: items; compiled=false; removed = []; doc }, tags)
 
-let read_implementation root name suppress_warnings impl =
+let read_implementation root name ~suppress_warnings impl =
   let id =
     Identifier.Mk.root (root, Odoc_model.Names.ModuleName.make_std name)
   in
diff --git a/src/loader/cmt.mli b/src/loader/cmt.mli
@@ -17,7 +17,7 @@
 val read_implementation :
   Odoc_model.Paths.Identifier.ContainerPage.t option ->
   string ->
-  bool ->
+  suppress_warnings:bool ->
   Typedtree.structure ->
   Odoc_model.Paths.Identifier.RootModule.t
   * Odoc_model.Lang.Signature.t
diff --git a/src/loader/cmti.ml b/src/loader/cmti.ml
@@ -815,7 +815,7 @@ and read_signature :
   | _ ->
     ({ Signature.items = Comment (`Docs doc_post) :: items; compiled=false; removed = []; doc }, tags)
 
-let read_interface root name suppress_warnings intf =
+let read_interface root name ~suppress_warnings intf =
   let id =
     Identifier.Mk.root (root, Odoc_model.Names.ModuleName.make_std name)
   in
diff --git a/src/loader/cmti.mli b/src/loader/cmti.mli
@@ -27,7 +27,7 @@ val read_module_expr :
 val read_interface :
   Odoc_model.Paths.Identifier.ContainerPage.t option ->
   string ->
-  bool ->
+  suppress_warnings:bool ->
   Typedtree.signature ->
   Paths.Identifier.RootModule.t
   * Odoc_model.Lang.Signature.t
diff --git a/src/loader/odoc_loader.ml b/src/loader/odoc_loader.ml
@@ -119,7 +119,7 @@ let read_cmti ~make_root ~parent ~filename ~suppress_warnings () =
               cmt_info.cmt_builddir )
           in
           let id, sg, canonical =
-            Cmti.read_interface parent name suppress_warnings intf
+            Cmti.read_interface parent name ~suppress_warnings intf
           in
           compilation_unit_of_sig ~make_root ~imports:cmt_info.cmt_imports
             ~interface ~sourcefile ~name ~id ?canonical sg)
@@ -178,7 +178,7 @@ let read_cmt ~make_root ~parent ~filename ~suppress_warnings () =
             ~id content
       | Implementation impl ->
           let id, sg, canonical =
-            Cmt.read_implementation parent name suppress_warnings impl
+            Cmt.read_implementation parent name ~suppress_warnings impl
           in
           compilation_unit_of_sig ~make_root ~imports ~interface ~sourcefile
             ~name ~id ?canonical sg
@@ -189,7 +189,7 @@ let read_cmi ~make_root ~parent ~filename ~suppress_warnings () =
   match cmi_info.cmi_crcs with
   | (name, (Some _ as interface)) :: imports when name = cmi_info.cmi_name ->
       let id, sg =
-        Cmi.read_interface parent name suppress_warnings
+        Cmi.read_interface parent name ~suppress_warnings
           (Odoc_model.Compat.signature cmi_info.cmi_sign)
       in
       compilation_unit_of_sig ~make_root ~imports ~interface ~name ~id sg
diff --git a/test/xref2/lib/common.cppo.ml b/test/xref2/lib/common.cppo.ml
@@ -70,15 +70,15 @@ let root_pp fmt (_ : Odoc_model.Root.t) = Format.fprintf fmt "Common.root"
 
 let model_of_string str = 
     let cmti = cmti_of_string str in
-    Odoc_loader__Cmti.read_interface (Some parent) "Root" false cmti
+    Odoc_loader__Cmti.read_interface (Some parent) "Root" ~suppress_warnings:false cmti
 
 let model_of_string_impl str =
 #if OCAML_VERSION < (4,13,0)
     let (cmt,_) = cmt_of_string str in
 #else
     let cmt = (cmt_of_string str).structure in
 #endif
-    Odoc_loader__Cmt.read_implementation (Some parent) "Root" false cmt
+    Odoc_loader__Cmt.read_implementation (Some parent) "Root" ~suppress_warnings:false cmt
 
 let signature_of_mli_string str =
     Odoc_xref2.Ident.reset ();
