Upgrade to OCaml 5.2

voodoos · Jun 27, 2024 · 6ecda9f · 6ecda9f
1 parent dae7fe3
commit 6ecda9f
Show file tree

Hide file tree

Showing 81 changed files with 9 additions and 10 deletions.
diff --git a/merlin-js.opam b/merlin-js.opam
@@ -10,7 +10,7 @@ build: [
   ["dune" "build" "-p" name "-j" jobs]
 ]
 depends: [
-  "ocaml" {>= "5.0"}
+  "ocaml" {>= "5.2" & < "5.3"}
   "dune" {>= "3.0"}
   "merlin-lib"
   "yojson" {>= "1.6.0"}

diff --git a/src/worker/static/stdlib/camlinternalFormat.cmi b/src/worker/static/stdlib/camlinternalFormat.cmi
diff --git a/src/worker/static/stdlib/camlinternalFormatBasics.cmi b/src/worker/static/stdlib/camlinternalFormatBasics.cmi
diff --git a/src/worker/static/stdlib/camlinternalLazy.cmi b/src/worker/static/stdlib/camlinternalLazy.cmi
diff --git a/src/worker/static/stdlib/camlinternalMod.cmi b/src/worker/static/stdlib/camlinternalMod.cmi
diff --git a/src/worker/static/stdlib/camlinternalOO.cmi b/src/worker/static/stdlib/camlinternalOO.cmi
diff --git a/src/worker/static/stdlib/dynlink.cmi b/src/worker/static/stdlib/dynlink.cmi
diff --git a/src/worker/static/stdlib/event.cmi b/src/worker/static/stdlib/event.cmi
diff --git a/src/worker/static/stdlib/nat.cmi b/src/worker/static/stdlib/nat.cmi
diff --git a/src/worker/static/stdlib/num.cmi b/src/worker/static/stdlib/num.cmi
diff --git a/src/worker/static/stdlib/profiling.cmi b/src/worker/static/stdlib/profiling.cmi
diff --git a/src/worker/static/stdlib/runtime_events.cmi b/src/worker/static/stdlib/runtime_events.cmi
diff --git a/src/worker/static/stdlib/std_exit.cmi b/src/worker/static/stdlib/std_exit.cmi
diff --git a/src/worker/static/stdlib/stdlib.cmi b/src/worker/static/stdlib/stdlib.cmi
diff --git a/src/worker/static/stdlib/stdlib__Arg.cmi b/src/worker/static/stdlib/stdlib__Arg.cmi
diff --git a/src/worker/static/stdlib/stdlib__Array.cmi b/src/worker/static/stdlib/stdlib__Array.cmi
diff --git a/src/worker/static/stdlib/stdlib__ArrayLabels.cmi b/src/worker/static/stdlib/stdlib__ArrayLabels.cmi
diff --git a/src/worker/static/stdlib/stdlib__Atomic.cmi b/src/worker/static/stdlib/stdlib__Atomic.cmi
diff --git a/src/worker/static/stdlib/stdlib__Bigarray.cmi b/src/worker/static/stdlib/stdlib__Bigarray.cmi
diff --git a/src/worker/static/stdlib/stdlib__Bool.cmi b/src/worker/static/stdlib/stdlib__Bool.cmi
diff --git a/src/worker/static/stdlib/stdlib__Buffer.cmi b/src/worker/static/stdlib/stdlib__Buffer.cmi
diff --git a/src/worker/static/stdlib/stdlib__Bytes.cmi b/src/worker/static/stdlib/stdlib__Bytes.cmi
diff --git a/src/worker/static/stdlib/stdlib__BytesLabels.cmi b/src/worker/static/stdlib/stdlib__BytesLabels.cmi
diff --git a/src/worker/static/stdlib/stdlib__Callback.cmi b/src/worker/static/stdlib/stdlib__Callback.cmi
diff --git a/src/worker/static/stdlib/stdlib__Char.cmi b/src/worker/static/stdlib/stdlib__Char.cmi
diff --git a/src/worker/static/stdlib/stdlib__Complex.cmi b/src/worker/static/stdlib/stdlib__Complex.cmi
diff --git a/src/worker/static/stdlib/stdlib__Condition.cmi b/src/worker/static/stdlib/stdlib__Condition.cmi
diff --git a/src/worker/static/stdlib/stdlib__Digest.cmi b/src/worker/static/stdlib/stdlib__Digest.cmi
diff --git a/src/worker/static/stdlib/stdlib__Domain.cmi b/src/worker/static/stdlib/stdlib__Domain.cmi
diff --git a/src/worker/static/stdlib/stdlib__Dynarray.cmi b/src/worker/static/stdlib/stdlib__Dynarray.cmi
diff --git a/src/worker/static/stdlib/stdlib__Effect.cmi b/src/worker/static/stdlib/stdlib__Effect.cmi
diff --git a/src/worker/static/stdlib/stdlib__Either.cmi b/src/worker/static/stdlib/stdlib__Either.cmi
diff --git a/src/worker/static/stdlib/stdlib__Ephemeron.cmi b/src/worker/static/stdlib/stdlib__Ephemeron.cmi
diff --git a/src/worker/static/stdlib/stdlib__Filename.cmi b/src/worker/static/stdlib/stdlib__Filename.cmi
diff --git a/src/worker/static/stdlib/stdlib__Float.cmi b/src/worker/static/stdlib/stdlib__Float.cmi
diff --git a/src/worker/static/stdlib/stdlib__Format.cmi b/src/worker/static/stdlib/stdlib__Format.cmi
diff --git a/src/worker/static/stdlib/stdlib__Fun.cmi b/src/worker/static/stdlib/stdlib__Fun.cmi
diff --git a/src/worker/static/stdlib/stdlib__Gc.cmi b/src/worker/static/stdlib/stdlib__Gc.cmi
diff --git a/src/worker/static/stdlib/stdlib__Hashtbl.cmi b/src/worker/static/stdlib/stdlib__Hashtbl.cmi
diff --git a/src/worker/static/stdlib/stdlib__In_channel.cmi b/src/worker/static/stdlib/stdlib__In_channel.cmi
diff --git a/src/worker/static/stdlib/stdlib__Int.cmi b/src/worker/static/stdlib/stdlib__Int.cmi
diff --git a/src/worker/static/stdlib/stdlib__Int32.cmi b/src/worker/static/stdlib/stdlib__Int32.cmi
diff --git a/src/worker/static/stdlib/stdlib__Int64.cmi b/src/worker/static/stdlib/stdlib__Int64.cmi
diff --git a/src/worker/static/stdlib/stdlib__Lazy.cmi b/src/worker/static/stdlib/stdlib__Lazy.cmi
diff --git a/src/worker/static/stdlib/stdlib__Lexing.cmi b/src/worker/static/stdlib/stdlib__Lexing.cmi
diff --git a/src/worker/static/stdlib/stdlib__List.cmi b/src/worker/static/stdlib/stdlib__List.cmi
diff --git a/src/worker/static/stdlib/stdlib__ListLabels.cmi b/src/worker/static/stdlib/stdlib__ListLabels.cmi
diff --git a/src/worker/static/stdlib/stdlib__Map.cmi b/src/worker/static/stdlib/stdlib__Map.cmi
diff --git a/src/worker/static/stdlib/stdlib__Marshal.cmi b/src/worker/static/stdlib/stdlib__Marshal.cmi
diff --git a/src/worker/static/stdlib/stdlib__MoreLabels.cmi b/src/worker/static/stdlib/stdlib__MoreLabels.cmi
diff --git a/src/worker/static/stdlib/stdlib__Mutex.cmi b/src/worker/static/stdlib/stdlib__Mutex.cmi
diff --git a/src/worker/static/stdlib/stdlib__Nativeint.cmi b/src/worker/static/stdlib/stdlib__Nativeint.cmi
diff --git a/src/worker/static/stdlib/stdlib__Obj.cmi b/src/worker/static/stdlib/stdlib__Obj.cmi
diff --git a/src/worker/static/stdlib/stdlib__Oo.cmi b/src/worker/static/stdlib/stdlib__Oo.cmi
diff --git a/src/worker/static/stdlib/stdlib__Option.cmi b/src/worker/static/stdlib/stdlib__Option.cmi
diff --git a/src/worker/static/stdlib/stdlib__Out_channel.cmi b/src/worker/static/stdlib/stdlib__Out_channel.cmi
diff --git a/src/worker/static/stdlib/stdlib__Parsing.cmi b/src/worker/static/stdlib/stdlib__Parsing.cmi
diff --git a/src/worker/static/stdlib/stdlib__Printexc.cmi b/src/worker/static/stdlib/stdlib__Printexc.cmi
diff --git a/src/worker/static/stdlib/stdlib__Printf.cmi b/src/worker/static/stdlib/stdlib__Printf.cmi
diff --git a/src/worker/static/stdlib/stdlib__Queue.cmi b/src/worker/static/stdlib/stdlib__Queue.cmi
diff --git a/src/worker/static/stdlib/stdlib__Random.cmi b/src/worker/static/stdlib/stdlib__Random.cmi
diff --git a/src/worker/static/stdlib/stdlib__Result.cmi b/src/worker/static/stdlib/stdlib__Result.cmi
diff --git a/src/worker/static/stdlib/stdlib__Scanf.cmi b/src/worker/static/stdlib/stdlib__Scanf.cmi
diff --git a/src/worker/static/stdlib/stdlib__Semaphore.cmi b/src/worker/static/stdlib/stdlib__Semaphore.cmi
diff --git a/src/worker/static/stdlib/stdlib__Seq.cmi b/src/worker/static/stdlib/stdlib__Seq.cmi
diff --git a/src/worker/static/stdlib/stdlib__Set.cmi b/src/worker/static/stdlib/stdlib__Set.cmi
diff --git a/src/worker/static/stdlib/stdlib__Stack.cmi b/src/worker/static/stdlib/stdlib__Stack.cmi
diff --git a/src/worker/static/stdlib/stdlib__StdLabels.cmi b/src/worker/static/stdlib/stdlib__StdLabels.cmi
diff --git a/src/worker/static/stdlib/stdlib__String.cmi b/src/worker/static/stdlib/stdlib__String.cmi
diff --git a/src/worker/static/stdlib/stdlib__StringLabels.cmi b/src/worker/static/stdlib/stdlib__StringLabels.cmi
diff --git a/src/worker/static/stdlib/stdlib__Sys.cmi b/src/worker/static/stdlib/stdlib__Sys.cmi
diff --git a/src/worker/static/stdlib/stdlib__Type.cmi b/src/worker/static/stdlib/stdlib__Type.cmi
diff --git a/src/worker/static/stdlib/stdlib__Uchar.cmi b/src/worker/static/stdlib/stdlib__Uchar.cmi
diff --git a/src/worker/static/stdlib/stdlib__Unit.cmi b/src/worker/static/stdlib/stdlib__Unit.cmi
diff --git a/src/worker/static/stdlib/stdlib__Weak.cmi b/src/worker/static/stdlib/stdlib__Weak.cmi
diff --git a/src/worker/static/stdlib/str.cmi b/src/worker/static/stdlib/str.cmi
diff --git a/src/worker/static/stdlib/thread.cmi b/src/worker/static/stdlib/thread.cmi
diff --git a/src/worker/static/stdlib/topdirs.cmi b/src/worker/static/stdlib/topdirs.cmi
diff --git a/src/worker/static/stdlib/unix.cmi b/src/worker/static/stdlib/unix.cmi
diff --git a/src/worker/static/stdlib/unixLabels.cmi b/src/worker/static/stdlib/unixLabels.cmi
diff --git a/src/worker/worker.ml b/src/worker/worker.ml
@@ -18,17 +18,16 @@ let sync_get url =
             None)
           (fun b -> Some (Typed_array.String.of_arrayBuffer b))
     | _ -> None
-  
+
 let filename_of_module unit_name =
   Printf.sprintf "%s.cmi" (String.uncapitalize_ascii unit_name)
 
 let reset_dirs () =
   Ocaml_utils.Directory_content_cache.clear ();
   let open Ocaml_utils.Load_path in
-  let dirs = get_paths () in
+  let { visible; hidden } = get_paths () in
   reset ();
-  List.iter ~f:(fun p ->
-    prepend_dir (Dir.create p)) dirs
+  init ~auto_include:no_auto_include ~visible ~hidden
 
 let add_dynamic_cmis dcs =
     let open Ocaml_typing.Persistent_env.Persistent_signature in
@@ -49,10 +48,10 @@ let add_dynamic_cmis dcs =
         Js_of_ocaml.Sys_js.create_file ~name ~content
       | None -> ()) dcs.dcs_toplevel_modules;
 
-    let new_load ~unit_name =
+    let new_load ~allow_hidden ~unit_name =
       let filename = filename_of_module unit_name in
       let fs_name = Filename.(concat "/static/stdlib" filename) in
-      (* Check if it's already been downloaded. This will be the 
+      (* Check if it's already been downloaded. This will be the
          case for all toplevel cmis. Also check whether we're supposed
          to handle this cmi *)
       if
@@ -70,18 +69,18 @@ let add_dynamic_cmis dcs =
           Printf.eprintf "Warning: Expected to find cmi at: %s\n%!"
             (Filename.concat dcs.Protocol.dcs_url filename)
       end;
-      old_loader ~unit_name
+      old_loader ~allow_hidden ~unit_name
     in
     load := new_load
-  
+
   let add_cmis { Protocol.static_cmis; dynamic_cmis } =
     List.iter static_cmis ~f:(fun { Protocol.sc_name; sc_content } ->
       let filename = Printf.sprintf "%s.cmi" (String.uncapitalize_ascii sc_name) in
       let name = Filename.(concat "/static/stdlib" filename) in
       Js_of_ocaml.Sys_js.create_file ~name ~content:sc_content);
     Option.iter ~f:add_dynamic_cmis dynamic_cmis;
     Protocol.Added_cmis
-          
+
 let config =
   let initial = Mconfig.initial in
   { initial with