2026-02-03 13:52.39: New job: test ocaml/odoc https://github.com/ocaml/odoc.git#refs/pull/1399/head (bb20ded6984bf1a0b031c48eb0a474aa53cf256b) (linux-x86_64:(lint-fmt)) Base: ocaml/opam:debian-13-ocaml-4.08@sha256:7cdc2a1943ac1462f548be7816c6d02f14e605659f225027208abe04795ea500 ocamlformat version: version 0.27.0 (from opam) To reproduce locally: git clone --recursive "https://github.com/ocaml/odoc.git" && cd "odoc" && git fetch origin "refs/pull/1399/head" && git reset --hard bb20ded6 cat > Dockerfile <<'END-OF-DOCKERFILE' FROM ocaml/opam:debian-13-ocaml-4.08@sha256:7cdc2a1943ac1462f548be7816c6d02f14e605659f225027208abe04795ea500 USER 1000:1000 RUN cd ~/opam-repository && (git cat-file -e 8381fdec20cf12f0c7a38782079db7131675d09e || git fetch origin master) && git reset -q --hard 8381fdec20cf12f0c7a38782079db7131675d09e && git log --no-decorate -n1 --oneline && opam update -u RUN opam depext -i dune WORKDIR /src RUN opam depext -i ocamlformat=0.27.0 COPY --chown=1000:1000 . /src/ RUN opam exec -- dune build @fmt --ignore-promoted-rules || (echo "dune build @fmt failed"; exit 2) END-OF-DOCKERFILE docker build . END-REPRO-BLOCK 2026-02-03 13:52.39: Using cache hint "ocaml/odoc-ocaml/opam:debian-13-ocaml-4.08@sha256:7cdc2a1943ac1462f548be7816c6d02f14e605659f225027208abe04795ea500-debian-13-4.08_opam-2.5-ocamlformat-8381fdec20cf12f0c7a38782079db7131675d09e" 2026-02-03 13:52.39: Using OBuilder spec: ((from ocaml/opam:debian-13-ocaml-4.08@sha256:7cdc2a1943ac1462f548be7816c6d02f14e605659f225027208abe04795ea500) (user (uid 1000) (gid 1000)) (run (cache (opam-archives (target /home/opam/.opam/download-cache))) (network host) (shell "cd ~/opam-repository && (git cat-file -e 8381fdec20cf12f0c7a38782079db7131675d09e || git fetch origin master) && git reset -q --hard 8381fdec20cf12f0c7a38782079db7131675d09e && git log --no-decorate -n1 --oneline && opam update -u")) (run (cache (opam-archives (target /home/opam/.opam/download-cache))) (network host) (shell "opam depext -i dune")) (workdir /src) (run (cache (opam-archives (target /home/opam/.opam/download-cache))) (network host) (shell "opam depext -i ocamlformat=0.27.0")) (copy (src .) (dst /src/)) (run (shell "opam exec -- dune build @fmt --ignore-promoted-rules || (echo \"dune build @fmt failed\"; exit 2)")) ) 2026-02-03 13:52.39: Waiting for resource in pool OCluster 2026-02-03 13:52.39: Waiting for worker… 2026-02-03 13:52.39: Got resource from pool OCluster Building on eumache All commits already cached HEAD is now at bb20ded69 Add missing OXCAML preprocessing (from ocaml/opam:debian-13-ocaml-4.08@sha256:7cdc2a1943ac1462f548be7816c6d02f14e605659f225027208abe04795ea500) Unable to find image 'ocaml/opam:debian-13-ocaml-4.08@sha256:7cdc2a1943ac1462f548be7816c6d02f14e605659f225027208abe04795ea500' locally docker.io/ocaml/opam@sha256:7cdc2a1943ac1462f548be7816c6d02f14e605659f225027208abe04795ea500: Pulling from ocaml/opam 281b80c799de: Already exists 00fc4ac50d5e: Already exists 7dc48a314bea: Already exists 8f654937f9e3: Already exists 1240f6fbe8cc: Already exists f77f967230a1: Already exists 1b4ac3d9a8c2: Already exists 27b61414175d: Already exists 26fabf9b20e0: Already exists b4426e2c299b: Already exists 9c12df827e83: Already exists 9a5608646906: Already exists 2a83342677ae: Already exists 5cbaedd36b85: Already exists 750a9830ac77: Already exists 400560080670: Already exists bad13195b6fa: Already exists b51fe78b498e: Already exists 185ce27e889b: Already exists 8a483dc1e759: Already exists 4de9d6d54a13: Already exists 0c268a22c8a0: Already exists 4f4fb700ef54: Already exists e61881bc2621: Already exists c864a4af1ff0: Already exists 42d012f62ad9: Already exists ccb2ed78fa2e: Already exists 84c22434b2f6: Already exists 18c972827b32: Already exists 4c6dcdff9e80: Already exists 280bf9d33ca6: Already exists 51ce8c29753c: Already exists 5ac80663b9d2: Already exists 93f877c915e3: Already exists 8573ccc6bb69: Already exists d26192cd75ec: Already exists c7cce15b715e: Already exists c998ca7b5976: Already exists 3cd1b61d806b: Already exists 19a26ec5319e: Already exists b1f6813045f3: Already exists 7a2b7a29296d: Already exists 94a0ebb2d223: Already exists 1c7f29f6d19a: Already exists 1493b442f343: Already exists Digest: sha256:7cdc2a1943ac1462f548be7816c6d02f14e605659f225027208abe04795ea500 Status: Downloaded newer image for ocaml/opam@sha256:7cdc2a1943ac1462f548be7816c6d02f14e605659f225027208abe04795ea500 2026-02-03 13:52.40 ---> using "4c1f60dc0cc5644c6a4c05cf3315bdbf9cc478b70e443b212a1220385bab8bba" from cache /: (user (uid 1000) (gid 1000)) /: (run (cache (opam-archives (target /home/opam/.opam/download-cache))) (network host) (shell "cd ~/opam-repository && (git cat-file -e 8381fdec20cf12f0c7a38782079db7131675d09e || git fetch origin master) && git reset -q --hard 8381fdec20cf12f0c7a38782079db7131675d09e && git log --no-decorate -n1 --oneline && opam update -u")) From https://github.com/ocaml/opam-repository * branch master -> FETCH_HEAD a6b2f19780..d01aee6c25 master -> origin/master 8381fdec20 Merge pull request #29263 from fpottier/opam-publish-menhir.20260122 <><> Updating package repositories ><><><><><><><><><><><><><><><><><><><><><><> [default] Initialised default (at git+file:///home/opam/opam-repository): [INFO] opam 2.1 and 2.2 include many performance and security improvements over 2.0; please consider upgrading (https://opam.ocaml.org/doc/Install.html) Everything as up-to-date as possible (run with --verbose to show unavailable upgrades). However, you may "opam upgrade" these packages explicitly, which will ask permission to downgrade or uninstall the conflicting packages. Nothing to do. # Run eval $(opam env) to update the current shell environment 2026-02-03 13:52.40 ---> using "decd3697d23cf2a26540c9ffea222925edad2cc84c1bb275d9e35cd783165411" from cache /: (run (cache (opam-archives (target /home/opam/.opam/download-cache))) (network host) (shell "opam depext -i dune")) # Detecting depexts using vars: arch=x86_64, os=linux, os-distribution=debian, os-family=debian # No extra OS packages requirements found. # All required OS packages found. # Now letting opam install the packages The following actions will be performed: - install dune 3.21.0 <><> Gathering sources ><><><><><><><><><><><><><><><><><><><><><><><><><><><><> [dune.3.21.0] found in cache <><> Processing actions <><><><><><><><><><><><><><><><><><><><><><><><><><><><> -> installed dune.3.21.0 Done. # Run eval $(opam env) to update the current shell environment 2026-02-03 13:52.40 ---> using "4f28854d2d0f22c241c0572b9c67e738c62ccd156e1194c082f955fa58f5fdf1" from cache /: (workdir /src) /src: (run (cache (opam-archives (target /home/opam/.opam/download-cache))) (network host) (shell "opam depext -i ocamlformat=0.27.0")) # Detecting depexts using vars: arch=x86_64, os=linux, os-distribution=debian, os-family=debian # No extra OS packages requirements found. # All required OS packages found. # Now letting opam install the packages The following actions will be performed: - install sexplib0 v0.14.0 [required by base] - install ocamlbuild 0.16.1 [required by fpath, astring, uuseg] - install cmdliner 1.3.0 [required by ocamlformat] - install either 1.0.0 [required by ocamlformat-lib] - install csexp 1.5.2 [required by ocamlformat] - install dune-build-info 3.21.0 [required by ocamlformat-lib] - install menhirLib 20260122 [required by ocamlformat-lib] - install menhirCST 20260122 [required by menhir] - install menhirGLR 20260122 [required by menhir] - install camlp-streams 5.0.1 [required by ocamlformat-lib] - install seq base [required by re] - install fix 20250919 [required by ocamlformat-lib] - install ocamlfind 1.9.8 [required by ocp-indent, astring, fpath, uuseg] - install menhirSdk 20260122 [required by ocamlformat-lib] - install ocaml-version 4.0.3 [required by ocamlformat-lib] - install dune-configurator 3.21.0 [required by base] - install re 1.11.0 [required by ocamlformat] - install topkg 1.1.1 [required by fpath, astring, uuseg] - install ocp-indent 1.9.0 [required by ocamlformat-lib] - install menhir 20260122 [required by ocamlformat-lib] - install base v0.14.3 [required by ocamlformat-lib] - install uutf 1.0.4 [required by ocamlformat-lib] - install astring 0.8.5 [required by ocamlformat-lib] - install stdio v0.14.0 [required by ocamlformat-lib] - install uucp 15.0.0 [required by uuseg] - install fpath 0.7.3 [required by ocamlformat-lib] - install uuseg 15.0.0 [required by ocamlformat-lib] - install ocamlformat-lib 0.27.0 [required by ocamlformat] - install ocamlformat 0.27.0 ===== 29 to install ===== <><> Gathering sources ><><><><><><><><><><><><><><><><><><><><><><><><><><><><> [astring.0.8.5] found in cache [base.v0.14.3] found in cache [camlp-streams.5.0.1] found in cache [cmdliner.1.3.0] found in cache [csexp.1.5.2] found in cache [dune-build-info.3.21.0] found in cache [dune-configurator.3.21.0] found in cache [either.1.0.0] found in cache [fix.20250919] found in cache [fpath.0.7.3] found in cache [menhir.20260122] found in cache [menhirCST.20260122] found in cache [menhirGLR.20260122] found in cache [menhirLib.20260122] found in cache [menhirSdk.20260122] found in cache [ocaml-version.4.0.3] found in cache [ocamlbuild.0.16.1] found in cache [ocamlfind.1.9.8] found in cache [ocamlformat.0.27.0] found in cache [ocamlformat-lib.0.27.0] found in cache [ocp-indent.1.9.0] found in cache [re.1.11.0] found in cache [sexplib0.v0.14.0] found in cache [stdio.v0.14.0] found in cache [topkg.1.1.1] found in cache [uucp.15.0.0] found in cache [uuseg.15.0.0] found in cache [uutf.1.0.4] found in cache <><> Processing actions <><><><><><><><><><><><><><><><><><><><><><><><><><><><> -> installed seq.base -> installed camlp-streams.5.0.1 -> installed csexp.1.5.2 -> installed cmdliner.1.3.0 -> installed either.1.0.0 -> installed fix.20250919 -> installed menhirCST.20260122 -> installed menhirGLR.20260122 -> installed menhirLib.20260122 -> installed menhirSdk.20260122 -> installed ocaml-version.4.0.3 -> installed re.1.11.0 -> installed sexplib0.v0.14.0 -> installed dune-build-info.3.21.0 -> installed dune-configurator.3.21.0 -> installed ocamlfind.1.9.8 -> installed ocamlbuild.0.16.1 -> installed ocp-indent.1.9.0 -> installed base.v0.14.3 -> installed menhir.20260122 -> installed stdio.v0.14.0 -> installed topkg.1.1.1 -> installed uutf.1.0.4 -> installed astring.0.8.5 -> installed fpath.0.7.3 -> installed uucp.15.0.0 -> installed uuseg.15.0.0 -> installed ocamlformat-lib.0.27.0 -> installed ocamlformat.0.27.0 Done. <><> ocp-indent.1.9.0 installed successfully ><><><><><><><><><><><><><><><><><> => This package requires additional configuration for use in editors. Install package 'user-setup', or manually: * for Emacs, add these lines to ~/.emacs: (add-to-list 'load-path "/home/opam/.opam/4.08/share/emacs/site-lisp") (require 'ocp-indent) * for Vim, add this line to ~/.vimrc: set rtp^="/home/opam/.opam/4.08/share/ocp-indent/vim" # Run eval $(opam env) to update the current shell environment 2026-02-03 13:52.40 ---> using "8b2c4104d925113e7f30cc5d9b1940e7d50419da3e312cded70bb5efe5af84a5" from cache /src: (copy (src .) (dst /src/)) 2026-02-03 13:52.41 ---> saved as "8c497b1c9c178cb81b03c921da65e17438a6f2c7984600a73541c4268d3d8a8d" /src: (run (shell "opam exec -- dune build @fmt --ignore-promoted-rules || (echo \"dune build @fmt failed\"; exit 2)")) ocamlformat: ignoring "src/loader/ident_env.ml" (syntax error) File "src/loader/ident_env.ml", line 116, characters 1-3: 116 | #if OCAML_VERSION < (5,2,0) ^^ Error: Syntax error -> required by _build/default/src/loader/.formatted/ident_env.ml -> required by alias src/loader/.formatted/fmt -> required by alias src/loader/fmt ocamlformat: ignoring "src/loader/odoc_loader.ml" (syntax error) File "src/loader/odoc_loader.ml", line 111, characters 1-3: 111 | #if defined OXCAML ^^ Error: Syntax error -> required by _build/default/src/loader/.formatted/odoc_loader.ml -> required by alias src/loader/.formatted/fmt -> required by alias src/loader/fmt File "src/xref2/find.mli", line 1, characters 0-0: diff --git a/_build/default/src/xref2/find.mli b/_build/default/src/xref2/.formatted/find.mli index b87ed5f..b26d4c1 100644 --- a/_build/default/src/xref2/find.mli +++ b/_build/default/src/xref2/.formatted/find.mli @@ -39,7 +39,8 @@ type field = [ `FField of TypeDecl.Field.t ] type unboxed_field = [ `FUnboxedField of TypeDecl.UnboxedField.t ] -type any_in_type = [ constructor | field | unboxed_field | polymorphic_constructor ] +type any_in_type = + [ constructor | field | unboxed_field | polymorphic_constructor ] type any_in_type_in_sig = [ `In_type of TypeName.t * TypeDecl.t * any_in_type ] File "src/xref2/env.mli", line 1, characters 0-0: diff --git a/_build/default/src/xref2/env.mli b/_build/default/src/xref2/.formatted/env.mli index f6651e6..4139860 100644 --- a/_build/default/src/xref2/env.mli +++ b/_build/default/src/xref2/.formatted/env.mli @@ -64,7 +64,8 @@ val add_module_type : val add_value : Identifier.Value.t -> Component.Value.t -> t -> t -val add_label : Identifier.Label.t -> Component.Label.t -> t -> unboxed:bool -> t +val add_label : + Identifier.Label.t -> Component.Label.t -> t -> unboxed:bool -> t val add_class : Identifier.Class.t -> Component.Class.t -> t -> t File "src/xref2/expand_tools.ml", line 1, characters 0-0: diff --git a/_build/default/src/xref2/expand_tools.ml b/_build/default/src/xref2/.formatted/expand_tools.ml index 7d28e5b..e1511dd 100644 --- a/_build/default/src/xref2/expand_tools.ml +++ b/_build/default/src/xref2/.formatted/expand_tools.ml @@ -58,7 +58,8 @@ let rec type_expr map t = if List.mem_assoc s map then raise Clash else Alias (type_expr map t, s) | Arrow (l, t1, t2) -> Arrow (l, type_expr map t1, type_expr map t2) | Tuple ts -> Tuple (List.map (fun (l, ty) -> (l, type_expr map ty)) ts) - | Unboxed_tuple ts -> Unboxed_tuple (List.map (fun (l, t) -> l, type_expr map t) ts) + | Unboxed_tuple ts -> + Unboxed_tuple (List.map (fun (l, t) -> (l, type_expr map t)) ts) | Constr (p, ts) -> Constr (p, List.map (type_expr map) ts) | Polymorphic_variant pv -> Polymorphic_variant (polymorphic_variant map pv) | Object o -> Object (object_ map o) File "src/occurrences/table.ml", line 1, characters 0-0: diff --git a/_build/default/src/occurrences/table.ml b/_build/default/src/occurrences/.formatted/table.ml index 3ed98bf..cebb763 100644 --- a/_build/default/src/occurrences/table.ml +++ b/_build/default/src/occurrences/.formatted/table.ml @@ -123,7 +123,8 @@ module Strip = struct | { iv = #DataType.t_pv; _ } as v -> (strip_datatype_path v :> FieldParent.t) - and strip_unboxed_field_parent_path : UnboxedFieldParent.t -> UnboxedFieldParent.t = + and strip_unboxed_field_parent_path : + UnboxedFieldParent.t -> UnboxedFieldParent.t = fun x -> match x with | { iv = #DataType.t_pv; _ } as v -> File "src/model/lang.ml", line 1, characters 0-0: diff --git a/_build/default/src/model/lang.ml b/_build/default/src/model/.formatted/lang.ml index 41b7c6b..10a709e 100644 --- a/_build/default/src/model/lang.ml +++ b/_build/default/src/model/.formatted/lang.ml @@ -17,12 +17,12 @@ open Paths module Source_loc_jane = struct - type t = { filename: string ; line_number: int } + type t = { filename : string; line_number : int } - let of_location (build_dir : string) (loc: Location.t) = - let { Location.loc_start ; _ } = loc in - let { Lexing.pos_fname ; pos_lnum ; _ } = loc_start in - { filename = build_dir ^ "/" ^ pos_fname ; line_number = pos_lnum } + let of_location (build_dir : string) (loc : Location.t) = + let { Location.loc_start; _ } = loc in + let { Lexing.pos_fname; pos_lnum; _ } = loc_start in + { filename = build_dir ^ "/" ^ pos_fname; line_number = pos_lnum } end (** {3 Modules} *) @@ -111,7 +111,7 @@ and ModuleType : sig s_expansion : simple_expansion option; s_expr : U.expr; s_path : Path.Module.t; - s_aliasable : bool + s_aliasable : bool; } type expr = @@ -527,11 +527,8 @@ end = Compilation_unit module rec Source_info : sig - type point_in_file = { - pos_lnum : int; - pos_cnum : int; - } - type location_in_file = {loc_start : point_in_file ; loc_end: point_in_file} + type point_in_file = { pos_lnum : int; pos_cnum : int } + type location_in_file = { loc_start : point_in_file; loc_end : point_in_file } type 'a jump_to_impl = | Unresolved of 'a @@ -607,8 +604,7 @@ let extract_signature_doc (s : Signature.t) = | ModuleType.U.Path p -> Path.is_hidden (p :> Path.t) | Signature _ -> true (* Hidden in some sense, we certainly want its top comment *) - | With (_, e) - | Strengthen (e, _, _) -> uexpr_considered_hidden e + | With (_, e) | Strengthen (e, _, _) -> uexpr_considered_hidden e | TypeOf (ModPath p, _) | TypeOf (StructInclude p, _) -> Path.is_hidden (p :> Path.t) in File "src/document/ML.mli", line 1, characters 0-0: diff --git a/_build/default/src/document/ML.mli b/_build/default/src/document/.formatted/ML.mli index 60d4785..e8d9e22 100644 --- a/_build/default/src/document/ML.mli +++ b/_build/default/src/document/.formatted/ML.mli @@ -31,4 +31,5 @@ val type_expr : ?needs_parentheses:bool -> Lang.TypeExpr.t -> Codefmt.t val record : Lang.TypeDecl.Field.t list -> Types.DocumentedSrc.one list -val unboxed_record : Lang.TypeDecl.UnboxedField.t list -> Types.DocumentedSrc.one list +val unboxed_record : + Lang.TypeDecl.UnboxedField.t list -> Types.DocumentedSrc.one list File "src/document/generator_signatures.ml", line 1, characters 0-0: diff --git a/_build/default/src/document/generator_signatures.ml b/_build/default/src/document/.formatted/generator_signatures.ml index 18326f0..048c7cf 100644 --- a/_build/default/src/document/generator_signatures.ml +++ b/_build/default/src/document/.formatted/generator_signatures.ml @@ -115,5 +115,6 @@ module type GENERATOR = sig val record : Lang.TypeDecl.Field.t list -> DocumentedSrc.one list - val unboxed_record : Lang.TypeDecl.UnboxedField.t list -> DocumentedSrc.one list + val unboxed_record : + Lang.TypeDecl.UnboxedField.t list -> DocumentedSrc.one list end File "src/search/html.ml", line 1, characters 0-0: diff --git a/_build/default/src/search/html.ml b/_build/default/src/search/.formatted/html.ml index d1ddf97..fd3dcfe 100644 --- a/_build/default/src/search/html.ml +++ b/_build/default/src/search/.formatted/html.ml @@ -4,7 +4,7 @@ open Odoc_model open Lang open Odoc_index -let url { Entry.id; kind; doc = _ ; source_loc = _} = +let url { Entry.id; kind; doc = _; source_loc = _ } = let open Entry in let stop_before = (* Some module/module types/... might not have an expansion, so we need to @@ -34,7 +34,7 @@ let display_constructor_args args = let open Odoc_model.Lang in match args with | TypeDecl.Constructor.Tuple args -> - let no_label arg = None, arg in + let no_label arg = (None, arg) in (match args with | _ :: _ :: _ -> Some TypeExpr.(Tuple (List.map no_label args)) | [ arg ] -> Some arg @@ -227,7 +227,7 @@ let html_string_of_doc doc = doc |> of_doc |> Format.asprintf "%a" (Tyxml.Html.pp_elt ()) let of_entry (entry : Entry.t) = - let ({ id; doc; kind ; source_loc=_} : Entry.t) = entry in + let ({ id; doc; kind; source_loc = _ } : Entry.t) = entry in let rhs = rhs_of_kind kind in let prefix_name, name = names_of_id id in let prefix_name = Some prefix_name and name = Some name in File "src/index/skeleton.ml", line 1, characters 0-0: diff --git a/_build/default/src/index/skeleton.ml b/_build/default/src/index/.formatted/skeleton.ml index 30350ed..14f6665 100644 --- a/_build/default/src/index/skeleton.ml +++ b/_build/default/src/index/.formatted/skeleton.ml @@ -13,14 +13,16 @@ module Entry = struct let doc = match u.content with Pack _ -> [] | Module m -> m.doc.elements in - Entry.entry ~id:u.id ~doc ~kind:(Module { has_expansion }) + Entry.entry ~id:u.id ~doc + ~kind:(Module { has_expansion }) ~source_loc:u.source_loc_jane let of_module (m : Module.t) = let has_expansion = match m.type_ with Alias (_, None) -> false | _ -> true in - Entry.entry ~id:m.id ~doc:m.doc.elements ~kind:(Module { has_expansion }) + Entry.entry ~id:m.id ~doc:m.doc.elements + ~kind:(Module { has_expansion }) ~source_loc:m.source_loc_jane let of_module_type (mt : ModuleType.t) = @@ -37,7 +39,8 @@ module Entry = struct | _ -> true in Entry.entry ~id:mt.id ~doc:mt.doc.elements - ~kind:(ModuleType { has_expansion }) ~source_loc:mt.source_loc_jane + ~kind:(ModuleType { has_expansion }) + ~source_loc:mt.source_loc_jane let of_type_decl (td : TypeDecl.t) = let kind = @@ -86,7 +89,8 @@ module Entry = struct in Entry.entry ~id:field.id ~doc:field.doc.elements ~kind ~source_loc - let of_unboxed_field id_parent params source_loc (field : TypeDecl.UnboxedField.t) = + let of_unboxed_field id_parent params source_loc + (field : TypeDecl.UnboxedField.t) = let params = varify_params params in let parent_type = TypeExpr.Constr @@ -95,7 +99,8 @@ module Entry = struct params ) in let kind = - Entry.UnboxedField { mutable_ = field.mutable_; type_ = field.type_; parent_type } + Entry.UnboxedField + { mutable_ = field.mutable_; type_ = field.type_; parent_type } in Entry.entry ~id:field.id ~doc:field.doc.elements ~kind ~source_loc @@ -235,10 +240,15 @@ and type_decl td = match td.representation with | None -> [] | Some (Variant cl) -> - List.concat_map (constructor td.id td.equation.params td.source_loc_jane) cl - | Some (Record fl) -> List.concat_map (field td.id td.equation.params td.source_loc_jane) fl + List.concat_map + (constructor td.id td.equation.params td.source_loc_jane) + cl + | Some (Record fl) -> + List.concat_map (field td.id td.equation.params td.source_loc_jane) fl | Some (Record_unboxed_product fl) -> - List.concat_map (unboxed_field td.id td.equation.params td.source_loc_jane) fl + List.concat_map + (unboxed_field td.id td.equation.params td.source_loc_jane) + fl | Some Extensible -> [] in [ { Tree.node = entry; children } ] File "src/model_desc/paths_desc.ml", line 1, characters 0-0: diff --git a/_build/default/src/model_desc/paths_desc.ml b/_build/default/src/model_desc/.formatted/paths_desc.ml index 90c8e5a..7edea31 100644 --- a/_build/default/src/model_desc/paths_desc.ml +++ b/_build/default/src/model_desc/.formatted/paths_desc.ml @@ -338,7 +338,10 @@ module General_paths = struct | `Field (x1, x2) -> C ("`Field", ((x1 :> r), x2), Pair (reference, Names.fieldname)) | `UnboxedField (x1, x2) -> - C ("`UnboxedField", ((x1 :> r), x2), Pair (reference, Names.unboxedfieldname)) + C + ( "`UnboxedField", + ((x1 :> r), x2), + Pair (reference, Names.unboxedfieldname) ) | `Extension (x1, x2) -> C ( "`Extension", File "src/xref2/find.ml", line 1, characters 0-0: diff --git a/_build/default/src/xref2/find.ml b/_build/default/src/xref2/.formatted/find.ml index e73fd96..84c49b1 100644 --- a/_build/default/src/xref2/find.ml +++ b/_build/default/src/xref2/.formatted/find.ml @@ -40,7 +40,8 @@ type field = [ `FField of TypeDecl.Field.t ] type unboxed_field = [ `FUnboxedField of TypeDecl.UnboxedField.t ] -type any_in_type = [ constructor | field | unboxed_field | polymorphic_constructor ] +type any_in_type = + [ constructor | field | unboxed_field | polymorphic_constructor ] type any_in_type_in_sig = [ `In_type of Odoc_model.Names.TypeName.t * TypeDecl.t * any_in_type ] @@ -209,7 +210,8 @@ let any_in_type (typ : TypeDecl.t) name = | [] -> None in let rec find_unboxed_field = function - | ({ TypeDecl.UnboxedField.name = name'; _ } as field) :: _ when name' = name -> + | ({ TypeDecl.UnboxedField.name = name'; _ } as field) :: _ + when name' = name -> Some (`FUnboxedField field) | _ :: tl -> find_unboxed_field tl | [] -> None File "src/xref2/component.mli", line 1, characters 0-0: diff --git a/_build/default/src/xref2/component.mli b/_build/default/src/xref2/.formatted/component.mli index aab0e19..54ee5e8 100644 --- a/_build/default/src/xref2/component.mli +++ b/_build/default/src/xref2/.formatted/component.mli @@ -213,7 +213,7 @@ and ModuleType : sig s_expansion : simple_expansion option; s_expr : U.expr; s_path : Cpath.module_; - s_aliasable : bool + s_aliasable : bool; } type expr = File "src/model/paths_types.ml", line 1, characters 0-0: diff --git a/_build/default/src/model/paths_types.ml b/_build/default/src/model/.formatted/paths_types.ml index eb24f8c..3550ffa 100644 --- a/_build/default/src/model/paths_types.ml +++ b/_build/default/src/model/.formatted/paths_types.ml @@ -155,7 +155,8 @@ module Identifier = struct and field = field_pv id (** @canonical Odoc_model.Paths.Identifier.Field.t *) - type unboxed_field_pv = [ `UnboxedField of unboxed_field_parent * UnboxedFieldName.t ] + type unboxed_field_pv = + [ `UnboxedField of unboxed_field_parent * UnboxedFieldName.t ] (** @canonical Odoc_model.Paths.Identifier.UnboxedField.t_pv *) and unboxed_field = unboxed_field_pv id File "src/model/reference.ml", line 1, characters 0-0: diff --git a/_build/default/src/model/reference.ml b/_build/default/src/model/.formatted/reference.ml index 68d2425..f0659b3 100644 --- a/_build/default/src/model/reference.ml +++ b/_build/default/src/model/.formatted/reference.ml @@ -480,7 +480,8 @@ let parse whole_reference_location s : | `TField -> `Field (parent next_token tokens, FieldName.make_std identifier) | `TUnboxedField -> - `UnboxedField (parent next_token tokens, UnboxedFieldName.make_std identifier) + `UnboxedField + (parent next_token tokens, UnboxedFieldName.make_std identifier) | `TExtension -> `Extension (signature next_token tokens, ExtensionName.make_std identifier) File "src/search/json_index/json_search.ml", line 1, characters 0-0: diff --git a/_build/default/src/search/json_index/json_search.ml b/_build/default/src/search/json_index/.formatted/json_search.ml index 0eca41b..10f557d 100644 --- a/_build/default/src/search/json_index/json_search.ml +++ b/_build/default/src/search/json_index/.formatted/json_search.ml @@ -56,7 +56,8 @@ let rec of_id x = | `Field (parent, name) -> ret "Field" (FieldName.to_string name) :: of_id (parent :> t) | `UnboxedField (parent, name) -> - ret "UnboxedField" (UnboxedFieldName.to_string name) :: of_id (parent :> t) + ret "UnboxedField" (UnboxedFieldName.to_string name) + :: of_id (parent :> t) | `Extension (parent, name) -> ret "Extension" (ExtensionName.to_string name) :: of_id (parent :> t) | `ExtensionDecl (parent, _, name) -> @@ -139,7 +140,8 @@ let of_doc (doc : Odoc_model.Comment.elements) = let txt = Text.of_doc doc in `String txt -let of_entry ({ Entry.id; doc; kind ; source_loc = _} as entry) html occurrences = +let of_entry ({ Entry.id; doc; kind; source_loc = _ } as entry) html occurrences + = let j_id = of_id id in let doc = of_doc doc in let kind = File "src/model_desc/lang_desc.ml", line 1, characters 0-0: diff --git a/_build/default/src/model_desc/lang_desc.ml b/_build/default/src/model_desc/.formatted/lang_desc.ml index 5c50948..42148db 100644 --- a/_build/default/src/model_desc/lang_desc.ml +++ b/_build/default/src/model_desc/.formatted/lang_desc.ml @@ -184,10 +184,10 @@ and moduletype_u_expr = (t, (o :> Paths.Path.t)), Pair (moduletype_type_of_desc, path) ) | Strengthen (e, x, a) -> - C - ( "Strengthen", - (e, (x :> Paths.Path.t), a), - Triple (moduletype_u_expr, path, bool) )) + C + ( "Strengthen", + (e, (x :> Paths.Path.t), a), + Triple (moduletype_u_expr, path, bool) )) and moduletype_t = let open Lang.ModuleType in @@ -358,7 +358,8 @@ and typedecl_representation = (function | Variant x -> C ("Variant", x, List typedecl_constructor) | Record x -> C ("Record", x, List typedecl_field) - | Record_unboxed_product x -> C ("Record_unboxed_product", x, List typedecl_unboxed_field) + | Record_unboxed_product x -> + C ("Record_unboxed_product", x, List typedecl_unboxed_field) | Extensible -> C0 "Extensible") and typedecl_variance = @@ -657,7 +658,8 @@ and typeexpr_t = (x1, x2, x3), Triple (Option typeexpr_label, typeexpr_t, typeexpr_t) ) | Tuple x -> C ("Tuple", x, List (Pair (Option string, typeexpr_t))) - | Unboxed_tuple x -> C ("Unboxed_tuple", x, List (Pair (Option string, typeexpr_t))) + | Unboxed_tuple x -> + C ("Unboxed_tuple", x, List (Pair (Option string, typeexpr_t))) | Constr (x1, x2) -> C ("Constr", ((x1 :> Paths.Path.t), x2), Pair (path, List typeexpr_t)) | Polymorphic_variant x -> @@ -817,7 +819,8 @@ and source_info_location_in_file_t : Lang.Source_info.location_in_file t = F ("loc_end", (fun t -> t.loc_end), source_info_point_in_file_t); ] -and source_info_annotation_with_pos_t : Lang.Source_info.annotation Lang.Source_info.with_pos t = +and source_info_annotation_with_pos_t : + Lang.Source_info.annotation Lang.Source_info.with_pos t = Pair (source_info_annotation_t, source_info_location_in_file_t) and source_info_t : Lang.Source_info.t t = File "src/document/comment.ml", line 1, characters 0-0: diff --git a/_build/default/src/document/comment.ml b/_build/default/src/document/.formatted/comment.ml index a7ce4ae..8038239 100644 --- a/_build/default/src/document/comment.ml +++ b/_build/default/src/document/.formatted/comment.ml @@ -44,7 +44,8 @@ module Reference = struct | `PolyConstructor (r, s) -> render_resolved (r :> t) ^ ".`" ^ ConstructorName.to_string s | `Field (r, s) -> render_resolved (r :> t) ^ "." ^ FieldName.to_string s - | `UnboxedField (r, s) -> render_resolved (r :> t) ^ "." ^ UnboxedFieldName.to_string s + | `UnboxedField (r, s) -> + render_resolved (r :> t) ^ "." ^ UnboxedFieldName.to_string s | `Extension (r, s) -> render_resolved (r :> t) ^ "." ^ ExtensionName.to_string s | `ExtensionDecl (r, _, s) -> @@ -89,7 +90,8 @@ module Reference = struct | `Constructor (p, f) -> render_unresolved (p :> t) ^ "." ^ ConstructorName.to_string f | `Field (p, f) -> render_unresolved (p :> t) ^ "." ^ FieldName.to_string f - | `UnboxedField (p, f) -> render_unresolved (p :> t) ^ "." ^ UnboxedFieldName.to_string f + | `UnboxedField (p, f) -> + render_unresolved (p :> t) ^ "." ^ UnboxedFieldName.to_string f | `Extension (p, f) -> render_unresolved (p :> t) ^ "." ^ ExtensionName.to_string f | `ExtensionDecl (p, f) -> File "test/odoc_print/odoc_print.ml", line 1, characters 0-0: diff --git a/_build/default/test/odoc_print/odoc_print.ml b/_build/default/test/odoc_print/.formatted/odoc_print.ml index 625a008..b5c664d 100644 --- a/_build/default/test/odoc_print/odoc_print.ml +++ b/_build/default/test/odoc_print/.formatted/odoc_print.ml @@ -37,7 +37,8 @@ and signature_of_module_type_expr = function | TypeOf _ -> None | With { w_expansion = Some e; _ } -> Some (signature_of_simple_expansion e) | With _ -> None - | Strengthen { s_expansion = Some e; _ } -> Some (signature_of_simple_expansion e) + | Strengthen { s_expansion = Some e; _ } -> + Some (signature_of_simple_expansion e) | Strengthen _ -> None and signature_of_module : File "src/xref2/compile.ml", line 1, characters 0-0: diff --git a/_build/default/src/xref2/compile.ml b/_build/default/src/xref2/.formatted/compile.ml index 3873010..a6f4113 100644 --- a/_build/default/src/xref2/compile.ml +++ b/_build/default/src/xref2/.formatted/compile.ml @@ -784,7 +784,7 @@ and type_decl_representation : | Variant cs -> Variant (List.map (type_decl_constructor env parent) cs) | Record fs -> Record (List.map (type_decl_field env parent) fs) | Record_unboxed_product fs -> - Record_unboxed_product (List.map (type_decl_unboxed_field env parent) fs) + Record_unboxed_product (List.map (type_decl_unboxed_field env parent) fs) | Extensible -> Extensible and type_decl_field env parent f = @@ -921,7 +921,8 @@ and type_expression : Env.t -> Id.LabelParent.t -> _ -> _ = Tuple (List.map (fun (lbl, ty) -> (lbl, type_expression env parent ty)) ts) | Unboxed_tuple ts -> - Unboxed_tuple (List.map (fun (l, t) -> l, type_expression env parent t) ts) + Unboxed_tuple + (List.map (fun (l, t) -> (l, type_expression env parent t)) ts) | Constr (path, ts') -> ( let cp = Component.Of_Lang.(type_path (empty ()) path) in let ts = List.map (type_expression env parent) ts' in File "src/xref2/subst.ml", line 1, characters 0-0: diff --git a/_build/default/src/xref2/subst.ml b/_build/default/src/xref2/.formatted/subst.ml index daee32e..38ee62e 100644 --- a/_build/default/src/xref2/subst.ml +++ b/_build/default/src/xref2/.formatted/subst.ml @@ -126,7 +126,7 @@ let rec substitute_vars vars t = | Tuple ts -> Tuple (List.map (fun (lbl, ty) -> (lbl, substitute_vars vars ty)) ts) | Unboxed_tuple ts -> - Unboxed_tuple (List.map (fun (l, t) -> l, substitute_vars vars t) ts) + Unboxed_tuple (List.map (fun (l, t) -> (l, substitute_vars vars t)) ts) | Constr (p, ts) -> Constr (p, List.map (substitute_vars vars) ts) | Polymorphic_variant v -> Polymorphic_variant (substitute_vars_poly_variant vars v) @@ -494,7 +494,7 @@ and type_decl_representation s t = | Variant cs -> Variant (List.map (type_decl_constructor s) cs) | Record fs -> Record (List.map (type_decl_field s) fs) | Record_unboxed_product fs -> - Record_unboxed_product (List.map (type_decl_unboxed_field s) fs) + Record_unboxed_product (List.map (type_decl_unboxed_field s) fs) | Extensible -> t and type_decl_constructor s t = @@ -554,7 +554,8 @@ and type_expr s t = | Alias (t, str) -> Alias (type_expr s t, str) | Arrow (lbl, t1, t2) -> Arrow (lbl, type_expr s t1, type_expr s t2) | Tuple ts -> Tuple (List.map (fun (lbl, ty) -> (lbl, type_expr s ty)) ts) - | Unboxed_tuple ts -> Unboxed_tuple (List.map (fun (l, t) -> l, type_expr s t) ts) + | Unboxed_tuple ts -> + Unboxed_tuple (List.map (fun (l, t) -> (l, type_expr s t)) ts) | Constr (p, ts) -> ( match type_path s p with | Replaced (t, eq) -> @@ -589,7 +590,13 @@ and module_type s t = let expr = match t.expr with Some m -> Some (module_type_expr s m) | None -> None in - { expr; source_loc = t.source_loc; source_loc_jane = t.source_loc_jane ; doc = t.doc; canonical = t.canonical } + { + expr; + source_loc = t.source_loc; + source_loc_jane = t.source_loc_jane; + doc = t.doc; + canonical = t.canonical; + } and module_type_substitution s t = let open Component.ModuleTypeSubstitution in @@ -667,7 +674,7 @@ and module_type_expr s t = s_expr = u_module_type_expr s s_expr; s_path = module_path s s_path; s_aliasable; - s_expansion = option_ simple_expansion s s_expansion + s_expansion = option_ simple_expansion s s_expansion; } and with_module_type_substitution s sub = File "src/model/paths.ml", line 1, characters 0-0: diff --git a/_build/default/src/model/paths.ml b/_build/default/src/model/.formatted/paths.ml index a3ec2a1..42ca6b5 100644 --- a/_build/default/src/model/paths.ml +++ b/_build/default/src/model/.formatted/paths.ml @@ -169,7 +169,8 @@ module Identifier = struct (p : class_signature :> label_parent) | { iv = `Constructor (p, _); _ } -> (p : datatype :> label_parent) | { iv = `Field (p, _); _ } -> (p : field_parent :> label_parent) - | { iv = `UnboxedField (p, _); _ } -> (p : unboxed_field_parent :> label_parent) + | { iv = `UnboxedField (p, _); _ } -> + (p : unboxed_field_parent :> label_parent) let label_parent n = label_parent_aux (n :> Id.non_src) @@ -580,7 +581,8 @@ module Identifier = struct let unboxed_field : UnboxedFieldParent.t * UnboxedFieldName.t -> [> `UnboxedField of UnboxedFieldParent.t * UnboxedFieldName.t ] id = - mk_parent UnboxedFieldName.to_string "unboxedfld" (fun (p, n) -> `UnboxedField (p, n)) + mk_parent UnboxedFieldName.to_string "unboxedfld" (fun (p, n) -> + `UnboxedField (p, n)) let extension : Signature.t * ExtensionName.t -> @@ -1032,10 +1034,12 @@ module Reference = struct | `Type _ as t -> (parent_type_identifier t :> Identifier.FieldParent.t option) - and unboxed_field_parent_identifier : unboxed_field_parent -> Identifier.UnboxedFieldParent.t option = + and unboxed_field_parent_identifier : + unboxed_field_parent -> Identifier.UnboxedFieldParent.t option = function | `Identifier id -> Some id - | `Type _ as t -> (parent_type_identifier t :> Identifier.UnboxedFieldParent.t option) + | `Type _ as t -> + (parent_type_identifier t :> Identifier.UnboxedFieldParent.t option) and label_parent_identifier : label_parent -> Identifier.LabelParent.t option = function File "src/xref2/lang_of.ml", line 1, characters 0-0: diff --git a/_build/default/src/xref2/lang_of.ml b/_build/default/src/xref2/.formatted/lang_of.ml index 7cbfcf3..7134af4 100644 --- a/_build/default/src/xref2/lang_of.ml +++ b/_build/default/src/xref2/.formatted/lang_of.ml @@ -863,7 +863,7 @@ and module_type_expr map identifier = function s_expr = u_module_type_expr map identifier s_expr; s_path = Path.module_ map s_path; s_aliasable; - s_expansion = Opt.map (simple_expansion map identifier) s_expansion + s_expansion = Opt.map (simple_expansion map identifier) s_expansion; } and module_type : @@ -935,7 +935,9 @@ and type_decl_unboxed_field : Component.TypeDecl.UnboxedField.t -> Odoc_model.Lang.TypeDecl.UnboxedField.t = fun map parent f -> - let identifier = Identifier.Mk.unboxed_field (parent, UnboxedFieldName.make_std f.name) in + let identifier = + Identifier.Mk.unboxed_field (parent, UnboxedFieldName.make_std f.name) + in { id = identifier; doc = docs (parent :> Identifier.LabelParent.t) f.doc; @@ -1031,7 +1033,7 @@ and type_expr map (parent : Identifier.LabelParent.t) (t : Component.TypeExpr.t) | Tuple ts -> Tuple (List.map (fun (lbl, ty) -> (lbl, type_expr map parent ty)) ts) | Unboxed_tuple ts -> - Unboxed_tuple (List.map (fun (l, t) -> l, type_expr map parent t) ts) + Unboxed_tuple (List.map (fun (l, t) -> (l, type_expr map parent t)) ts) | Constr (path, ts) -> Constr ( (Path.type_ map path :> Paths.Path.Type.t), File "src/xref2/ref_tools.ml", line 1, characters 0-0: diff --git a/_build/default/src/xref2/ref_tools.ml b/_build/default/src/xref2/.formatted/ref_tools.ml index ffd28fa..2d279ca 100644 --- a/_build/default/src/xref2/ref_tools.ml +++ b/_build/default/src/xref2/.formatted/ref_tools.ml @@ -531,12 +531,16 @@ module CS = struct | `S (parent', parent_cp, sg) -> ( let sg = Tools.prefix_signature (parent_cp, sg) in let find_ambiguous = - (find_ambiguous : ?kind:([> `Any ] as 'a) -> - (Component.Signature.t -> string -> Find.any_in_type_in_sig list) - -> - Component.Signature.t -> string -> (Find.any_in_type_in_sig, [> `Find_by_name of 'a * string ]) result) + (find_ambiguous + : ?kind:([> `Any ] as 'a) -> + (Component.Signature.t -> string -> Find.any_in_type_in_sig list) -> + Component.Signature.t -> + string -> + ( Find.any_in_type_in_sig, + [> `Find_by_name of 'a * string ] ) + result) in - find_ambiguous Find.any_in_type_in_sig sg name_s >>= function + find_ambiguous Find.any_in_type_in_sig sg name_s >>= function | `In_type (_, _, `FField _) -> not_a_constructor name_s | `In_type (_, _, `FUnboxedField _) -> not_a_constructor name_s | `In_type (typ_name, _, `FPoly cs) -> @@ -614,8 +618,8 @@ module UF = struct type t = Resolved.UnboxedField.t let in_env env name = - env_lookup_by_name Env.s_unboxed_field name env >>= fun (`UnboxedField (id, _)) -> - Ok (`Identifier id :> t) + env_lookup_by_name Env.s_unboxed_field name env + >>= fun (`UnboxedField (id, _)) -> Ok (`Identifier id :> t) let not_an_unboxed_field name = (* Let's pretend we didn't see the constructor/field and say we didn't find anything. *) @@ -633,19 +637,23 @@ module UF = struct | `In_type (typ_name, _, `FUnboxedField _) -> Ok (`UnboxedField - ((`Type (parent', typ_name) :> Resolved.UnboxedFieldParent.t), name))) + ( (`Type (parent', typ_name) :> Resolved.UnboxedFieldParent.t), + name ))) | `T (parent', t) -> ( find Find.any_in_type t (fun x -> x) name_s >>= function | `FConstructor _ -> not_an_unboxed_field name_s | `FPoly _ -> not_an_unboxed_field name_s | `FField _ -> not_an_unboxed_field name_s - | `FUnboxedField _ -> Ok (`UnboxedField ((parent' :> Resolved.UnboxedFieldParent.t), name))) + | `FUnboxedField _ -> + Ok + (`UnboxedField ((parent' :> Resolved.UnboxedFieldParent.t), name)) + ) let of_component _env parent name = Ok (`UnboxedField - ( (parent : Resolved.DataType.t :> Resolved.UnboxedFieldParent.t), - UnboxedFieldName.make_std name )) + ( (parent : Resolved.DataType.t :> Resolved.UnboxedFieldParent.t), + UnboxedFieldName.make_std name )) end module MM = struct File "src/xref2/link.ml", line 1, characters 0-0: diff --git a/_build/default/src/xref2/link.ml b/_build/default/src/xref2/.formatted/link.ml index a52c8c3..513f37e 100644 --- a/_build/default/src/xref2/link.ml +++ b/_build/default/src/xref2/.formatted/link.ml @@ -481,7 +481,8 @@ let warn_on_hidden_representation (id : Id.Type.t) (id :> Id.any) | Record_unboxed_product fields -> if List.exists internal_unboxed_field fields then - Lookup_failures.report_warning "@[<2>Hidden unboxed fields in type '%a'@]" + Lookup_failures.report_warning + "@[<2>Hidden unboxed fields in type '%a'@]" Component.Fmt.(model_identifier fmt_cfg) (id :> Id.any) | Extensible -> () @@ -990,7 +991,7 @@ and type_decl_representation : | Variant cs -> Variant (List.map (type_decl_constructor env parent) cs) | Record fs -> Record (List.map (type_decl_field env parent) fs) | Record_unboxed_product fs -> - Record_unboxed_product (List.map (type_decl_unboxed_field env parent) fs) + Record_unboxed_product (List.map (type_decl_unboxed_field env parent) fs) | Extensible -> Extensible and type_decl : Env.t -> Id.Signature.t -> TypeDecl.t -> TypeDecl.t = @@ -1138,7 +1139,8 @@ and type_expression : Env.t -> Id.Signature.t -> _ -> _ = (fun (lbl, ty) -> (lbl, type_expression env parent visited ty)) ts) | Unboxed_tuple ts -> - Unboxed_tuple (List.map (fun (l, t) -> l, type_expression env parent visited t) ts) + Unboxed_tuple + (List.map (fun (l, t) -> (l, type_expression env parent visited t)) ts) | Constr (path', ts') -> ( let path = type_path env path' in let ts = List.map (type_expression env parent visited) ts' in File "src/document/generator.ml", line 1, characters 0-0: diff --git a/_build/default/src/document/generator.ml b/_build/default/src/document/.formatted/generator.ml index ee37928..a03f6b8 100644 --- a/_build/default/src/document/generator.ml +++ b/_build/default/src/document/.formatted/generator.ml @@ -290,7 +290,9 @@ module Make (Syntax : SYNTAX) = struct let source id syntax_info infos source_code = let url = path id in let mapper (info, (loc : Lang.Source_info.location_in_file)) = - match info_of_info info with Some x -> Some (x, (loc.loc_start.pos_cnum, loc.loc_end.pos_cnum)) | None -> None + match info_of_info info with + | Some x -> Some (x, (loc.loc_start.pos_cnum, loc.loc_end.pos_cnum)) + | None -> None in let infos = Odoc_utils.List.filter_map mapper infos in let syntax_info = @@ -412,7 +414,7 @@ module Make (Syntax : SYNTAX) = struct and tuple ?(needs_parentheses = false) ~boxed lst = let opt_label = function - None -> O.noop + | None -> O.noop | Some lbl -> O.txt lbl ++ O.txt ":" ++ O.cut in let res = @@ -422,8 +424,8 @@ module Make (Syntax : SYNTAX) = struct opt_label lbl ++ type_expr ~needs_parentheses:true typ)) in let lparen = if boxed then "(" else "#(" in - if Syntax.Type.Tuple.always_parenthesize || needs_parentheses || not boxed then - enclose ~l:lparen res ~r:")" + if Syntax.Type.Tuple.always_parenthesize || needs_parentheses || not boxed + then enclose ~l:lparen res ~r:")" else res and type_expr ?(needs_parentheses = false) (t : Odoc_model.Lang.TypeExpr.t) @@ -479,10 +481,8 @@ module Make (Syntax : SYNTAX) = struct (Link.from_path (path :> Paths.Path.t)) | Poly (polyvars, t) -> O.txt ("'" ^ String.concat ~sep:" '" polyvars ^ ". ") ++ type_expr t - | Quote t -> - O.span (O.txt "<[ " ++ O.box_hv (type_expr t) ++ O.txt " ]>") - | Splice t -> - O.span (O.txt "$" ++ type_expr ~needs_parentheses:true t) + | Quote t -> O.span (O.txt "<[ " ++ O.box_hv (type_expr t) ++ O.txt " ]>") + | Splice t -> O.span (O.txt "$" ++ type_expr ~needs_parentheses:true t) | Package pkg -> enclose ~l:"(" ~r:")" (O.keyword "module" ++ O.txt " " @@ -522,7 +522,8 @@ module Make (Syntax : SYNTAX) = struct val record : Lang.TypeDecl.Field.t list -> DocumentedSrc.one list - val unboxed_record : Lang.TypeDecl.UnboxedField.t list -> DocumentedSrc.one list + val unboxed_record : + Lang.TypeDecl.UnboxedField.t list -> DocumentedSrc.one list val exn : Lang.Exception.t -> Item.t @@ -579,9 +580,7 @@ module Make (Syntax : SYNTAX) = struct let field mutable_ id typ = let url = Url.from_identifier ~stop_before:true id in let name = Paths.Identifier.name id in - let attrs = - [ "def"; "record"; Url.Anchor.string_of_kind url.kind ] - in + let attrs = [ "def"; "record"; Url.Anchor.string_of_kind url.kind ] in let cell = (* O.td ~a:[ O.a_class ["def"; kind ] ] * [O.a ~a:[O.a_href ("#" ^ anchor); O.a_class ["anchor"]] [] @@ -1653,7 +1652,7 @@ module Make (Syntax : SYNTAX) = struct | Signature _ -> true | With (_, expr) -> is_elidable_with_u expr | TypeOf _ -> false - | Strengthen (expr,_,_) -> is_elidable_with_u expr + | Strengthen (expr, _, _) -> is_elidable_with_u expr and umty : Odoc_model.Lang.ModuleType.U.expr -> text = fun m -> @@ -1710,6 +1709,7 @@ module Make (Syntax : SYNTAX) = struct Syntax.Mod.open_tag ++ O.txt " ... " ++ Syntax.Mod.close_tag | Strengthen { s_expr; s_path; _ } -> O.box_hv @@ mty_strengthen s_expr (s_path :> Paths.Path.t) + and mty_in_decl : Paths.Identifier.Signature.t -> Odoc_model.Lang.ModuleType.expr -> text = File "src/xref2/component.ml", line 1, characters 0-0: diff --git a/_build/default/src/xref2/component.ml b/_build/default/src/xref2/.formatted/component.ml index 6bc682e..90fdb21 100644 --- a/_build/default/src/xref2/component.ml +++ b/_build/default/src/xref2/.formatted/component.ml @@ -222,7 +222,7 @@ and ModuleType : sig s_expansion : simple_expansion option; s_expr : U.expr; s_path : Cpath.module_; - s_aliasable : bool + s_aliasable : bool; } type expr = @@ -982,7 +982,8 @@ module Fmt = struct (substitution_list c) subs | TypeOf (t_desc, _) -> module_type_type_of_desc c ppf t_desc | Strengthen (e, p, _) -> - Format.fprintf ppf "%a with %a" (u_module_type_expr c) e (module_path c) p + Format.fprintf ppf "%a with %a" (u_module_type_expr c) e (module_path c) + p and module_type_expr c ppf mt = let open ModuleType in @@ -2229,7 +2230,7 @@ module Of_Lang = struct (List.map (type_decl_constructor ident_map) cs) | Record fs -> Record (List.map (type_decl_field ident_map) fs) | Record_unboxed_product fs -> - Record_unboxed_product (List.map (type_decl_unboxed_field ident_map) fs) + Record_unboxed_product (List.map (type_decl_unboxed_field ident_map) fs) | Extensible -> Extensible and type_decl_constructor ident_map t = @@ -2341,7 +2342,8 @@ module Of_Lang = struct Tuple (List.map (fun (lbl, ty) -> (lbl, type_expression ident_map ty)) ts) | Unboxed_tuple ts -> - Unboxed_tuple (List.map (fun (l, t) -> l, type_expression ident_map t) ts) + Unboxed_tuple + (List.map (fun (l, t) -> (l, type_expression ident_map t)) ts) | Polymorphic_variant v -> Polymorphic_variant (type_expr_polyvar ident_map v) | Poly (s, ts) -> Poly (s, type_expression ident_map ts) @@ -2558,10 +2560,11 @@ module Of_Lang = struct | Lang.ModuleType.Strengthen s -> let s' = ModuleType. - { s_expr = u_module_type_expr ident_map s.s_expr; + { + s_expr = u_module_type_expr ident_map s.s_expr; s_path = module_path ident_map s.s_path; s_aliasable = s.s_aliasable; - s_expansion = option simple_expansion ident_map s.s_expansion + s_expansion = option simple_expansion ident_map s.s_expansion; } in ModuleType.Strengthen s' @@ -2585,7 +2588,7 @@ module Of_Lang = struct doc = docs ident_map v.doc; value = v.value; source_loc = v.source_loc; - source_loc_jane = v.source_loc_jane + source_loc_jane = v.source_loc_jane; } and include_ ident_map i = dune build @fmt failed "/usr/bin/env" "bash" "-c" "opam exec -- dune build @fmt --ignore-promoted-rules || (echo "dune build @fmt failed"; exit 2)" failed with exit status 2 2026-02-03 13:52.44: Job failed: Failed: Build failed