Changes following PR review

Author: jonludlam

src/driver/compile.ml

@@ -315,7 +315,7 @@ let html_generate ~occurrence_file ~remaps output_dir linked =
                  let index = index.output_file in
                  (Some search_uris, Some index)
            in
-           Odoc.html_generate ?search_uris ?index ~remap:remap_file ~output_dir
+           Odoc.html_generate ?search_uris ?index ?remap:remap_file ~output_dir
              ~input_file ();
            Odoc.html_generate ?search_uris ?index ~output_dir ~input_file
              ~as_json:true ());

src/driver/odoc.ml

@@ -180,7 +180,7 @@ let compile_index ?(ignore_output = false) ~output_file ?occurrence_file ~json
   ignore @@ Cmd_outputs.submit log desc cmd (Some output_file)
 
 let html_generate ~output_dir ?index ?(ignore_output = false)
-    ?(search_uris = []) ?(remap = None) ?(as_json = false) ~input_file:file () =
+    ?(search_uris = []) ?remap ?(as_json = false) ~input_file:file () =
   let open Cmd in
   let index =
     match index with None -> empty | Some idx -> v "--index" % p idx

src/driver/odoc.mli

@@ -55,7 +55,7 @@ val html_generate :
   ?index:Fpath.t ->
   ?ignore_output:bool ->
   ?search_uris:Fpath.t list ->
-  ?remap:Fpath.t option ->
+  ?remap:Fpath.t ->
   ?as_json:bool ->
   input_file:Fpath.t ->
   unit ->

src/driver/packages.ml

@@ -474,7 +474,7 @@ let of_packages ~packages_dir packages =
         in
         let selected = List.mem pkg.name packages in
         let remaps =
-          if List.mem pkg.name packages then []
+          if selected then []
           else
             let local_pkg_path = Fpath.to_string (Fpath.to_dir_path pkg_dir) in
             let pkg_path =