Driver: better handling of incompatible options

Signed-off-by: Paul-Elliot <[email protected]>

Author: panglesd

src/driver/dune_style.ml

@@ -34,13 +34,11 @@ let of_dune_build dir =
             let cmtidir =
               Fpath.(path / Printf.sprintf ".%s.objs" libname / "byte")
             in
-            match Fpath.rem_prefix dir path with
-            | Some pkg_dir ->
-                ( pkg_dir,
-                  Packages.Lib.v pkg_dir
-                    (Util.StringMap.singleton libname libname)
-                    libname path (Some cmtidir) )
-            | None -> failwith "Error")
+            let pkg_dir = Fpath.rem_prefix dir path |> Option.get in
+            ( pkg_dir,
+              Packages.Lib.v pkg_dir
+                (Util.StringMap.singleton libname libname)
+                libname path (Some cmtidir) ))
           libs
       in
       let packages =

src/driver/odoc_driver.ml

@@ -508,20 +508,22 @@ let run libs verbose packages_dir odoc_dir odocl_dir html_dir stats nb_workers
   let () = Worker_pool.start_workers env sw nb_workers in
 
   let all =
-    if voodoo then
-      match package_name with
-      | Some p -> Voodoo.of_voodoo p blessed
-      | None -> failwith "Need a package name for voodoo"
-    else
-      match dune_style with
-      | Some dir -> Dune_style.of_dune_build dir
-      | None ->
-          let libs = if libs = [] then Ocamlfind.all () else libs in
-          let libs =
-            List.map Ocamlfind.sub_libraries libs
-            |> List.fold_left Util.StringSet.union Util.StringSet.empty
-          in
-          Packages.of_libs packages_dir libs
+    match (voodoo, package_name, dune_style, packages_dir) with
+    | true, Some p, None, None -> Voodoo.of_voodoo p blessed
+    | false, None, Some dir, None -> Dune_style.of_dune_build dir
+    | false, None, None, packages_dir ->
+        let libs = if libs = [] then Ocamlfind.all () else libs in
+        let libs =
+          List.map Ocamlfind.sub_libraries libs
+          |> List.fold_left Util.StringSet.union Util.StringSet.empty
+        in
+        Packages.of_libs packages_dir libs
+    | true, None, _, _ -> failwith "--voodoo requires --package-name"
+    | false, Some _, _, _ -> failwith "--package-name requires --voodoo"
+    | true, _, _, Some _ | false, _, Some _, Some _ ->
+        failwith "--packages-dir is only useful in opam mode"
+    | true, _, Some _, _ ->
+        failwith "--voodoo and --dune-style are mutually independent"
   in
   let partial =
     if voodoo then