ocaml / odoc / 3141

71%

master: 71%

Build Type

push

github

Committed by Jon Ludlam's Agent

Commit Message

Fix assertion in resolved_signature_fragment for substituted module type

The assertion in [Subst.resolved_signature_fragment] at the
[`Root (`ModuleType p)] case assumed the named module type at the LHS
of a [subst] could never itself be substituted. That holds for
substitutions originating from source [with]-clauses on a non-removed
module type, but two code paths in odoc produce a [Subst.t] whose
[module_type_replacement] map binds X to a manifest:

  1. [Tools.apply_inner_substs] synthesises such a substitution to
     model a top-level destructive [module type X := ...] item, and
     applies it to the rest of the signature.
  2. [Tools.fragmap]'s [sub_of_removed] does the same for a regular
     [... with module type X := ...] expression, then applies it to
     the substituted signature.

In either case, any later item in that signature carrying a
[with]-clause that names X has its resolved [with]-clause fragment
walked by [Subst]; the [`Root (`ModuleType p)] arm sees that p is
exactly the substituted module type and trips [assert false].

Replace [assert false] with [raise Invalidated]: the standard
mechanism in this file for "this resolved form is no longer valid".
[Subst.type_fragment] / [Subst.module_fragment] /
[Subst.module_type_fragment] catch it, unresolve the fragment to its
syntactic [`Dot] form, and re-resolve it against the post-substitution
context (where the [include] / module-type expression has been
replaced with the manifest of X).

Promotes test/xref2/apply_inner_substs_module_type.t/run.t to reflect
the now clean output across all six trigger positions.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>

Coverage Stats

1 of 1 new or added line in 1 file covered. (100.0%)

10414 of 14631 relevant lines covered (71.18%)

5900.66 hits per line