ocaml 5 (#397)

Author: rvantonder

comby-kernel.opam

@@ -18,12 +18,12 @@ build: [
     ]
 ]
 depends: [
-  "dune" {>= "2.8.0"}
-  "ocaml" {>= "4.08.1"}
-  "core_kernel"
+  "dune" {>= "3.11.0"}
+  "ocaml" {>= "5.1.0"}
+  "core_kernel" {>= "v0.17" & < "v0.18~"}
   "ppx_deriving"
-  "ppx_deriving_yojson" {>= "3.6.0"}
-  "yojson" {>= "1.6.0" < "2.0.0"}
+  "ppx_deriving_yojson" {>= "3.6.0" & < "4.0.0"}
+  "yojson" {>= "1.6.0" & < "3.0.0"}
   "pcre"
   # vendored dependencies
   "bigstringaf"

comby-semantic.opam

@@ -18,14 +18,14 @@ build: [
     ]
 ]
 depends: [
-  "dune" {>= "2.8.0"}
-  "ocaml" {>= "4.08.1"}
-  "core_kernel"
+  "dune" {>= "3.11.0"}
+  "ocaml" {>= "5.1.0"}
+  "core_kernel" {>= "v0.17" & < "v0.18~"}
   "ppx_deriving"
   "lwt"
   "cohttp"
   "cohttp-lwt-unix"
-  "yojson" {>= "1.6.0" < "2.0.0"}
+  "yojson" {>= "1.6.0" & < "3.0.0"}
   "bisect_ppx" {with-test & dev & >= "2.5.0"}
 ]
 synopsis: "A match engine for structural code search and replace that supports ~every language"

comby.opam

@@ -18,8 +18,8 @@ build: [
     ]
 ]
 depends: [
-  "dune" {>= "2.8.0"}
-  "ocaml" {>= "4.08.1"}
+  "dune" {>= "3.11.0"}
+  "ocaml" {>= "5.1.0"}
   "conf-autoconf"
   "conf-gmp"
   "conf-libev" {os-distribution != "ol"}
@@ -31,21 +31,21 @@ depends: [
   "cohttp-lwt-unix"
   "comby-kernel" {= version}
   "comby-semantic" {= version}
-  "core"
+  "core" {>= "v0.17" & < "v0.18~"}
+  "core_unix" {>= "v0.17" & < "v0.18~"}
   "cstruct-lwt"
-  "hack_parallel" {arch != "arm32" & arch != "arm64"}
   "lwt"
   "lwt_react"
   "lwt_ssl"
   "parany" {>= "12.0.3"}
-  "patience_diff" {>= "v0.14" & < "v0.15"}
+  "patience_diff" {>= "v0.17" & < "v0.18~"}
   "ppx_deriving"
-  "ppx_deriving_yojson" {>= "3.6.0"}
-  "yojson" {>= "1.6.0" < "2.0.0"}
+  "ppx_deriving_yojson" {>= "3.6.0" & < "4.0.0"}
+  "yojson" {>= "1.6.0" & < "3.0.0"}
   "pcre"
-  "shell"
-  "tar" {< "3.0.0"}
-  "tar-unix" {< "3.0.0"}
+  "shell" {>= "v0.17" & < "v0.18~"}
+  "tar"
+  "tar-unix"
   "toml" {>= "6.0.0"}
   "bisect_ppx" {with-test & dev & >= "2.5.0"}
 ]

docs/third-party-licenses/ALL.txt

@@ -90,31 +90,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 
-LICENSE FOR hack_parallel:
-
-MIT License
-
-Copyright (c) 2013-present, Facebook, Inc.
-Modified work Copyright (c) 2018-2019 Rijnard van Tonder
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
 LICENSE FOR opium:
 
 # This file is generated by dune, edit dune-project instead
@@ -1492,4 +1467,3 @@ whether future versions of the GNU Lesser General Public License shall
 apply, that proxy's public statement of acceptance of any version is
 permanent authorization for you to choose that version for the
 Library.
-

docs/third-party-licenses/hack_parallel/LICENSE

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-LIBS="ppx_deriving_yojson core ppxlib ppx_deriving hack_parallel opium pcre-ocaml ocaml-tls camlzip bisect_ppx ocaml-ci-scripts patdiff lwt toml"
+LIBS="ppx_deriving_yojson core ppxlib ppx_deriving opium pcre-ocaml ocaml-tls camlzip bisect_ppx ocaml-ci-scripts patdiff lwt toml"
 
 rm ALL.txt 2> /dev/null
 for l in $LIBS; do rm -rf $l; done
@@ -25,10 +25,6 @@ wget -P ppxlib https://raw.githubusercontent.com/ocaml-ppx/ppxlib/master/LICENSE
 mkdir ppx_deriving && \
 wget -P ppx_deriving https://raw.githubusercontent.com/ocaml-ppx/ppx_deriving/master/LICENSE.txt
 
-# MIT
-mkdir hack_parallel && \
-wget -P hack_parallel https://raw.githubusercontent.com/rvantonder/hack-parallel/master/LICENSE
-
 # MIT
 mkdir opium && \
 wget -P opium https://raw.githubusercontent.com/rgrinberg/opium/master/opium.opam

docs/third-party-licenses/pull-and-update-release-scripts.sh

@@ -1,9 +1,17 @@
 open Core
 open Camlzip
-open Polymorphic_compare
+open Poly
 open Comby_kernel
 
-let debug = Sys.getenv "DEBUG_COMBY" |> Option.is_some
+let debug = Stdlib.Sys.getenv_opt "DEBUG_COMBY" |> Option.is_some
+
+let ls_dir path = Stdlib.Sys.readdir path |> Array.to_list
+
+let is_directory path =
+  try Stdlib.Sys.is_directory path with
+  | Sys_error _ -> false
+
+let is_file path = Stdlib.Sys.file_exists path && not (is_directory path)
 
 (* skip or continue directory descent *)
 type 'a next =
@@ -12,18 +20,18 @@ type 'a next =
 
 let fold_directory ?(sorted = false) root ~init ~f =
   let rec aux acc absolute_path depth =
-    if Sys.is_file absolute_path = `Yes then (
+    if is_file absolute_path then (
       match f acc ~depth ~absolute_path ~is_file:true with
       | Continue acc | Skip acc -> acc)
-    else if Sys.is_directory absolute_path = `Yes then (
+    else if is_directory absolute_path then (
       match f acc ~depth ~absolute_path ~is_file:false with
       | Skip acc -> acc
       | Continue acc ->
         let dir_contents =
           if Option.is_some (Sys.getenv "COMBY_TEST") || sorted then
-            Sys.ls_dir absolute_path |> List.sort ~compare:String.compare |> List.rev
+            ls_dir absolute_path |> List.sort ~compare:String.compare |> List.rev
           else
-            Sys.ls_dir absolute_path
+            ls_dir absolute_path
         in
         List.fold dir_contents ~init:acc ~f:(fun acc subdir ->
           aux acc (Filename.concat absolute_path subdir) (depth + 1)))
@@ -44,7 +52,7 @@ let parse_source_directories
   let exact_file_paths, file_patterns =
     List.partition_map file_filters ~f:(fun path ->
       let is_exact path =
-        (String.contains path '/' && Sys.is_file path = `Yes) || Sys.is_file ("." ^/ path) = `Yes
+        (String.contains path '/' && is_file path) || is_file ("." ^/ path)
         (* See if it matches something in the current directory *)
       in
       if is_exact path then Either.First path else Either.Second path)
@@ -161,8 +169,8 @@ let parse_templates ?metasyntax ?(warn_for_missing_file_in_dir = false) paths =
   let f acc ~depth:_ ~absolute_path ~is_file =
     let is_leaf_directory absolute_path =
       (not is_file)
-      && Sys.ls_dir absolute_path
-         |> List.for_all ~f:(fun path -> Sys.is_directory (absolute_path ^/ path) = `No)
+      && ls_dir absolute_path
+         |> List.for_all ~f:(fun path -> not (is_directory (absolute_path ^/ path)))
     in
     if is_leaf_directory absolute_path then (
       match parse_directory absolute_path with
@@ -172,7 +180,7 @@ let parse_templates ?metasyntax ?(warn_for_missing_file_in_dir = false) paths =
       Continue acc
   in
   List.concat_map paths ~f:(fun path ->
-    if Sys.is_directory path = `Yes then
+    if is_directory path then
       fold_directory path ~sorted:true ~init:[] ~f
     else
       parse_toml ?metasyntax path)
@@ -223,7 +231,6 @@ type user_input_options =
 
 type compute_mode =
   [ `Sequential
-  | `Hack_parallel of int
   | `Parany of int
   ]
 
@@ -411,11 +418,11 @@ let parse_metasyntax metasyntax_path =
   match metasyntax_path with
   | None -> Matchers.Metasyntax.default_metasyntax
   | Some metasyntax_path ->
-    (match Sys.file_exists metasyntax_path with
-     | `No | `Unknown ->
+    (match Stdlib.Sys.file_exists metasyntax_path with
+     | false ->
        Format.eprintf "Could not open file: %s@." metasyntax_path;
        exit 1
-     | `Yes ->
+     | true ->
        Yojson.Safe.from_file metasyntax_path
        |> Matchers.Metasyntax.of_yojson
        |> (function
@@ -462,26 +469,26 @@ let emit_errors { input_options; output_options; _ } =
     ; ( Option.is_some input_options.directory_depth
         && Option.value_exn input_options.directory_depth < 0
       , "-depth must be 0 or greater." )
-    ; ( Sys.is_directory input_options.target_directory = `No
+    ; ( not (is_directory input_options.target_directory)
       , "Directory specified with -d or -directory is not a directory." )
     ; ( output_options.json_only_diff && not output_options.json_lines
       , "-json-only-diff can only be supplied with -json-lines." )
     ; ( Option.is_some output_options.chunk_matches && Option.is_some input_options.zip_file
       , "chunk-matches output format is not supported for zip files." )
     ; ( Option.is_some output_options.interactive_review
-        && not (String.equal input_options.target_directory (Sys.getcwd ()))
+        && not (String.equal input_options.target_directory (Stdlib.Sys.getcwd ()))
       , "Please remove the -d option and `cd` to the directory where you want to review from. The \
          -review, -editor, or -default-no options should only be run at the root directory of the \
          project files to patch." )
     ; (let message =
          match input_options.templates with
          | Some inputs ->
            List.find_map inputs ~f:(fun input ->
-             if Sys.is_file input = `Yes then (
+             if is_file input then (
                match Toml.Parser.from_filename input with
                | `Error (s, _) -> Some s
                | _ -> None)
-             else if not (Sys.is_directory input = `Yes) then
+             else if not (is_directory input) then
                Some
                  (Format.sprintf "Directory %S specified with -templates is not a directory." input)
              else
@@ -598,11 +605,11 @@ let filter_zip_entries file_filters exclude_directory_prefix exclude_file_prefix
       && has_acceptable_suffix filename)
 
 let syntax custom_matcher_path =
-  match Sys.file_exists custom_matcher_path with
-  | `No | `Unknown ->
+  match Stdlib.Sys.file_exists custom_matcher_path with
+  | false ->
     Format.eprintf "Could not open file: %s@." custom_matcher_path;
     exit 1
-  | `Yes ->
+  | true ->
     Yojson.Safe.from_file custom_matcher_path
     |> Matchers.Language.Syntax.of_yojson
     |> (function
@@ -783,7 +790,7 @@ let create
     | Directory ->
       let target_directory =
         if target_directory = "." then
-          Filename.realpath target_directory
+          Filename_unix.realpath target_directory
         else
           target_directory
       in

lib/app/configuration/command_configuration.ml

@@ -64,7 +64,6 @@ type user_input_options =
 
 type compute_mode =
   [ `Sequential
-  | `Hack_parallel of int
   | `Parany of int
   ]
 

lib/app/configuration/command_configuration.mli

@@ -11,6 +11,8 @@
   comby.patdiff
   comby.camlzip
   core
+  core_unix
+  core_unix.filename_unix
   pcre
   yojson
   ppx_deriving_yojson

lib/app/configuration/dune

@@ -1,22 +1,18 @@
 open Comby_semantic
 
-let debug =
-  match Sys.getenv "DEBUG_COMBY" with
-  | exception Not_found -> false
-  | _ -> true
+let debug = Stdlib.Sys.getenv_opt "DEBUG_COMBY" |> Option.is_some
 
 let lsif_endpoint =
-  match Sys.getenv "LSIF_SERVER" with
-  | exception Not_found -> "https://sourcegraph.com/.api/graphql"
-  | address -> address
+  Stdlib.Sys.getenv_opt "LSIF_SERVER"
+  |> Option.value ~default:"https://sourcegraph.com/.api/graphql"
 
 let repository_remote () =
   let open Core in
-  In_channel.input_all (Unix.open_process_in "git config --get remote.origin.url")
+  In_channel.input_all (Core_unix.open_process_in "git config --get remote.origin.url")
 
 let revision () =
   let open Core in
-  In_channel.input_all (Unix.open_process_in "git rev-parse HEAD")
+  In_channel.input_all (Core_unix.open_process_in "git rev-parse HEAD")
 
 let lsif_hover ~name:_ ~filepath ~line ~column =
   let open Core_kernel in
@@ -29,7 +25,7 @@ let lsif_hover ~name:_ ~filepath ~line ~column =
     in
     let revision = revision () |> String.rstrip in
     if debug then Format.printf "Repository remote: %s\nRevision: %s@." repository revision;
-    String.chop_prefix_if_exists filepath ~prefix:(Sys.getcwd ())
+    String.chop_prefix_if_exists filepath ~prefix:(Stdlib.Sys.getcwd ())
     |> fun filepath_relative_root ->
     if debug then Format.printf "File relative root: %s@." filepath;
     if debug then Format.printf "Querying type at %d::%d@." line column;