Squashed 'odoc/' changes from 4e51ebdec..c7281d056 · jon.recoil.org/odoc-docsite@2c4788f

Testing of the @doc-json output

Squashed 'odoc/' changes from 4e51ebdec..c7281d056

c7281d056 Fix oxcaml build compatibility for PR #1400 cherry-pick

git-subtree-dir: odoc
git-subtree-split: c7281d05663066649a407efa1b94b484bfc2a744

Jon Ludlam's Agent 3 weeks ago 2c4788fa ed811a3e

3 changed files

expand all

unified split

src

xref2

compile.ml

link.ml

tools.ml

src/xref2/compile.ml

··· 393 393 | Signature _ -> true 394 394 | With (_, expr) -> is_elidable_with_u expr 395 395 | TypeOf _ -> false 396 + | Strengthen (expr, _, _) -> is_elidable_with_u expr 396 397 in 397 398 if is_elidable_with_u expr then ModuleType expr 398 399 else ModuleType (u_module_type_expr env id expr)

src/xref2/link.ml

··· 718 718 | Signature _ -> true 719 719 | With (_, expr) -> is_elidable_with_u expr 720 720 | TypeOf _ -> false 721 + | Strengthen (expr, _, _) -> is_elidable_with_u expr 721 722 in 722 723 match decl with 723 724 | ModuleType expr when is_elidable_with_u expr -> ModuleType expr

src/xref2/tools.ml

··· 2381 2381 Component.Delayed.put (fun () -> 2382 2382 { 2383 2383 Component.Module.source_loc = None; 2384 + source_loc_jane = None; 2384 2385 doc = modsubst.doc; 2385 2386 type_ = Alias (modsubst.manifest, None); 2386 2387 canonical = None; ··· 2402 2403 Component.Delayed.put (fun () -> 2403 2404 { 2404 2405 Component.ModuleType.source_loc = None; 2406 + source_loc_jane = None; 2405 2407 doc = modtypesubst.doc; 2406 2408 expr = Some modtypesubst.manifest; 2407 2409 canonical = None;