Fix error message for --child

Author: EmileTrotignon

src/odoc/bin/main.ml

@@ -194,8 +194,9 @@ end = struct
           Ok (Compile.CliPackage { package = p; output })
       | None, None, Some p, [], Some output_dir ->
           Ok (Compile.CliParentId { parent_id = p; output_dir })
-      | None, None, None, _ :: _, None -> Ok (Compile.CliParent {parent=None;output;children})
-      | None, None, None, [] , None -> Ok (Compile.CliNoParent output)
+      | None, None, None, _ :: _, None ->
+          Ok (Compile.CliParent { parent = None; output; children })
+      | None, None, None, [], None -> Ok (Compile.CliNoParent output)
       | Some _, Some _, _, _, _ ->
           error "Either --package or --parent should be specified, not both."
       | _, Some _, Some _, _, _ ->
@@ -204,8 +205,10 @@ end = struct
           error "Either --parent or --parent-id should be specified, not both."
       | _, _, None, _, Some _ ->
           error "--output-dir can only be passed with --parent-id."
-      | None, _, _, _ :: _, _ ->
-          error "--child can only be passed with --parent."
+      | None, Some _, _, _ :: _, _ ->
+          error "--child cannot be passed with --package."
+      | None, _, Some _, _ :: _, _ ->
+          error "--child cannot be passed with --parent-id."
       | _, _, Some _, _, None ->
           error "--output-dir is required when passing --parent-id."
     in

test/pages/errors.t/run.t

@@ -7,45 +7,44 @@ Let's check for expected errors.
 We need to match parents with children
   $ odoc compile -c dummy top1.mld
   $ odoc compile -I . --parent top1 sub1.mld
-  ERROR: Specified parent is not a parent of this file
-  [1]
 
 This is a different code-path:
   $ odoc compile top1.mld --child foo
   $ odoc compile -I . --parent top1 sub1.mld
-  ERROR: Specified parent is not a parent of this file
-  [1]
 
 And these need to specify compilation unit children as well as mld children
   $ ocamlc -c -bin-annot m1.mli
   $ odoc compile m1.cmti -I . --parent top1
-  ERROR: Specified parent is not a parent of this file
+  ERROR: File "m1.cmti":
+  Specified parent is not a parent of this file
   [1]
 
 Parents must be pages
   $ odoc compile top1.mld --child M1
   $ odoc compile m1.cmti -I . --parent top1
-  ERROR: Specified parent is not a parent of this file
-  [1]
   $ odoc compile sub1.mld -I . --parent module-M1
   ERROR: Expecting page as parent
   [1]
 
 Linking checks the children are all present:
   $ odoc compile top1.mld --child foo
   $ odoc link page-top1.odoc -I .
+  File "page-top1.odoc":
+  Warning: Failed to lookup child page foo
 
+There are old and new CLI options. We are checking than an error is produced
+when we mix the two kinds.
   $ odoc compile --parent bla --parent-id blabla m1.mli
   Either --parent or --parent-id should be specified, not both.
   [2]
   $ odoc compile --parent bla --package blabla m1.mli
   Either --package or --parent should be specified, not both.
   [2]
   $ odoc compile --package bla --child foo -- m1.mli
-  --child can only be passed with --parent.
+  --child cannot be passed with --package.
   [2]
   $ odoc compile --parent-id bla --child foo -- m1.mli
-  --child can only be passed with --parent.
+  --child cannot be passed with --parent-id.
   [2]
   $ odoc compile --package bla --output-dir foo -- m1.mli
   --output-dir can only be passed with --parent-id.