Merge pull request #6644 from kit-ty-kate/no-poly-list-mem

Replace every polymorphic uses of List.mem by a version that doesn't use Repr.equal

Author: kit-ty-kate

master_changes.md

@@ -102,6 +102,7 @@ users)
 ## Shell
 
 ## Internal
+  * Replace every polymorphic uses of `List.mem` by a version that doesn't use `Repr.equal` [#6644 @kit-ty-kate]
 
 ## Internal: Unix
 
@@ -170,19 +171,26 @@ users)
 ## opam-solver
 
 ## opam-format
+  * `OpamFormula.equal_relop`: was added [#6644 @kit-ty-kate]
+  * `OpamTypesBase.{action,pkg_flag,simple_arg,arg,filter,command}_equal`: were added [#6644 @kit-ty-kate]
+  * `OpamVariable.variable_contents_equal`: was added [#6644 @kit-ty-kate]
 
 ## opam-core
   * `OpamConsole.log`: does not keep log messages before initialization if the code is ran through a library [#6487 @kit-ty-kate]
   * `OpamCoreConfig.in_opam`: was added [#6487 @kit-ty-kate]
   * `OpamSystem.cpu_count`: now uses a C binding instead of system utilities to get the number of cores of the current machine [#6634 @kit-ty-kate]
   * `OpamSystem.is_reg_dir`: is now exposed, which returns `true` only if its parameter is a directory, exists and is not a symlink. It returns `false` otherwise [#6450 @kit-ty-kate]
   * `OpamCompat.List.fold_left_map`: was added [#6442 @kit-ty-kate]
+  * `OpamCompat.List.equal`: was added [#6644 @kit-ty-kate]
   * `OpamCompat.Map.filter_map`: was added [#6442 @kit-ty-kate]
   * `OpamCompat.MAP`: was added [#6442 @kit-ty-kate]
+  * `OpamCompat.Pair.equal`: was added [#6644 @kit-ty-kate]
   * `OpamCompat.String.{starts_with,ends_with,for_all,fold_left}`: were added [#6442 @kit-ty-kate]
   * `OpamHash.check_string`: was added [#6661 @kit-ty-kate]
+  * `OpamHash.equal_kind`: was added [#6644 @kit-ty-kate]
   * `OpamStd.List.fold_left_map`: was moved to `OpamCompat.List.fold_left_map` [#6442 @kit-ty-kate]
   * `OpamStd.List.{cons,find_opt,filter_map}`: were removed. Use `Stdlib.List` instead. [#6442 @kit-ty-kate]
+  * `OpamStd.List.mem`: was added, having as argument the equality function [#6644 @kit-ty-kate]
   * `OpamStd.Op.{(@@),(|>)}`: were removed. Use `Stdlib` instead. [#6442 @kit-ty-kate]
   * `OpamStd.Option.{map,iter,compare,equal,to_string,some}`: were removed. Use `Stdlib.Option` instead. [#6442 @kit-ty-kate]
   * `OpamStd.Map.filter_map`: is now the implementation from `Stdlib.Map` when using OCaml >= 4.11 [#6442 @kit-ty-kate]

src/client/opamAdminCommand.ml

@@ -271,7 +271,8 @@ let cache_command cli =
 
     let cache_dir_url = OpamFilename.remove_prefix_dir repo_root cache_dir in
     if not no_repo_update then
-      if not (List.mem cache_dir_url (OpamFile.Repo.dl_cache repo_def)) then
+      if not (OpamStd.List.mem String.equal
+                cache_dir_url (OpamFile.Repo.dl_cache repo_def)) then
         (OpamConsole.msg "Adding %s to %s...\n"
            cache_dir_url (OpamFile.to_string repo_file);
          OpamFile.Repo.write repo_file
@@ -671,7 +672,9 @@ let add_hashes_command cli =
             let hashes = OpamFile.URL.checksum urlf in
             let hashes =
               if replace then
-                List.filter (fun h -> List.mem (OpamHash.kind h) hash_types)
+                List.filter (fun h ->
+                    OpamStd.List.mem OpamHash.equal_kind
+                      (OpamHash.kind h) hash_types)
                   hashes
               else hashes
             in
@@ -822,10 +825,13 @@ let lint_command cli =
       OpamPackage.Map.fold (fun nv prefix ret ->
           let opam_file = OpamRepositoryPath.opam repo_root prefix nv in
           let w, _ = OpamFileTools.lint_file ~handle_dirname:true opam_file in
-          if List.exists (fun (n,_,_) -> List.mem n ign) w then ret else
+          if List.exists (fun (n,_,_) -> OpamStd.List.mem Int.equal n ign) w then
+            ret
+          else
           let w =
             List.filter (fun (n,_,_) ->
-                (incl = [] || List.mem n incl) && not (List.mem n excl))
+                (incl = [] || OpamStd.List.mem Int.equal n incl) &&
+                not (OpamStd.List.mem Int.equal n excl))
               w
           in
           if w <> [] then

src/client/opamAdminRepoUpgrade.ml

@@ -420,7 +420,8 @@ let do_upgrade repo_root =
       let opam0 = OpamFile.OPAM.read opam_file in
       OpamFile.OPAM.print_errors ~file:opam_file opam0;
       let nv = OpamFile.OPAM.package opam0 in
-      if not (List.mem nv.name ocaml_package_names) &&
+      if not (OpamStd.List.mem OpamPackage.Name.equal
+                nv.name ocaml_package_names) &&
          not (OpamPackage.Name.Set.mem nv.name all_base_packages) then
         let opam = OpamFileTools.add_aux_files ~files_subdir_hashes:true opam0 in
         let opam =

src/client/opamAuxCommands.ml

@@ -287,7 +287,7 @@ let autopin_aux st ?quiet ?recurse ?subpath ?locked
         in
         match OpamStd.Option.Op.( primary_url st nv >>= OpamUrl.local_dir) with
         | Some d ->
-          List.mem d pinning_dirs
+          OpamStd.List.mem OpamFilename.Dir.equal d pinning_dirs
         | None -> false)
       st.pinned
   in
@@ -555,7 +555,8 @@ let check_and_revert_sandboxing root config =
         OpamInitDefaults.sandbox_wrappers
       |> List.flatten
     in
-    List.filter (fun cmd -> List.mem cmd init_sdbx_cmds)
+    List.filter (fun cmd ->
+        OpamStd.List.mem OpamTypesBase.command_equal cmd init_sdbx_cmds)
       OpamFile.Wrappers.(wrap_build w @ wrap_install w @ wrap_remove w)
   in
   let env = fun v ->
@@ -596,7 +597,8 @@ let check_and_revert_sandboxing root config =
     if working_or_noop then config else
     let wrappers =
       let filter sdbx_cmd =
-        List.filter (fun cmd_l -> not (List.mem cmd_l sdbx_cmd))
+        List.filter (fun cmd_l ->
+            not (OpamStd.List.mem OpamTypesBase.command_equal cmd_l sdbx_cmd))
       in
       List.fold_left OpamFile.Wrappers.(fun w -> function
           | `build sdbx_build ->

src/client/opamCLIVersion.ml

@@ -12,7 +12,9 @@ type t = int * int
 
 let supported_versions = [(2, 0); (2, 1); (2,2); (2,3); (2,4)]
 
-let is_supported v = List.mem v supported_versions
+let is_supported v =
+  OpamStd.List.mem (OpamCompat.Pair.equal Int.equal Int.equal)
+    v supported_versions
 
 let of_string s =
   match String.index s '.' with

src/client/opamClient.ml

@@ -432,8 +432,8 @@ let update
     let all_repos = OpamRepositoryName.Map.keys rt.repositories in
     if dev_only then []
     else if names <> [] then
-      List.filter
-        (fun r -> List.mem (OpamRepositoryName.to_string r) names)
+      List.filter (fun r ->
+          OpamStd.List.mem String.equal (OpamRepositoryName.to_string r) names)
         all_repos
     else if all then all_repos
     else OpamSwitchState.repos_list st
@@ -506,7 +506,8 @@ let update
   let remaining =
     let ps = packages ++ ignore_packages in
     List.filter (fun n -> not (
-        List.mem (OpamRepositoryName.of_string n) repo_names ||
+        OpamStd.List.mem OpamRepositoryName.equal
+          (OpamRepositoryName.of_string n) repo_names ||
         (try OpamPackage.has_name ps (OpamPackage.Name.of_string n)
          with Failure _ -> false) ||
         (try OpamPackage.Set.mem (OpamPackage.of_string n) ps

src/client/opamCommands.ml

@@ -2379,7 +2379,7 @@ let repository cli =
               OpamConsole.error_and_exit `Not_found
                 "No switch %s found"
                 (OpamSwitch.to_string sw)
-            else if List.mem sw acc then acc
+            else if OpamStd.List.mem OpamSwitch.equal sw acc then acc
             else acc @ [sw]
           | `Current_switch | `This_switch ->
             match OpamStateConfig.get_switch_opt () with
@@ -2388,7 +2388,7 @@ let repository cli =
                                    '--set-default'?";
               acc
             | Some sw ->
-              if List.mem sw acc then acc
+              if OpamStd.List.mem OpamSwitch.equal sw acc then acc
               else acc @ [sw])
         [] scope
     in
@@ -4286,7 +4286,9 @@ let clean cli =
                (OpamPackage.Set.elements st.pinned)
            in
            List.iter (fun d ->
-               if not (List.mem d pinning_overlay_dirs) then rmdir d)
+               if not (OpamStd.List.mem OpamFilename.Dir.equal
+                         d pinning_overlay_dirs) then
+                 rmdir d)
              (OpamFilename.dirs (OpamPath.Switch.Overlay.dir root sw));
            let keep_sources_dir =
              OpamPackage.Set.elements
@@ -4297,7 +4299,9 @@ let clean cli =
            in
            OpamFilename.dirs (OpamPath.Switch.sources_dir root sw) |>
            List.iter (fun d ->
-               if not (List.mem d keep_sources_dir) then rmdir d))
+               if not (OpamStd.List.mem OpamFilename.Dir.equal
+                         d keep_sources_dir) then
+                 rmdir d))
          switches);
     if repos then
       (OpamFilename.with_flock `Lock_write (OpamPath.repos_lock gt.root)

src/client/opamConfigCommand.ml

@@ -713,7 +713,12 @@ let switch_allowed_fields, switch_allowed_sections =
   in
   let allowed_sections =
     let rem_elem new_elems elems =
-      List.filter (fun n -> not (List.mem n new_elems)) elems
+      List.filter (fun n ->
+          not (OpamStd.List.mem
+                 (OpamCompat.Pair.equal
+                    OpamVariable.equal OpamVariable.variable_contents_equal)
+                 n new_elems))
+        elems
     in
     lazy (
       OpamFile.Switch_config.([

src/client/opamRepositoryCommand.ml

@@ -27,7 +27,7 @@ let update_selection gt ~global ~switches update_fun =
   if global then
     (* ensure all unselected switches aren't modified by changing the default *)
     (List.iter (fun sw ->
-         if not (List.mem sw switches) then
+         if not (OpamStd.List.mem OpamSwitch.equal sw switches) then
            OpamSwitchState.update_repositories gt (fun r -> r) sw)
         (OpamFile.Config.installed_switches gt.config);
      let (), gt =
@@ -230,58 +230,60 @@ let update_with_auto_upgrade rt repo_names =
   else
   let rt, done_upgrade =
     List.fold_left (fun (rt, done_upgrade) r ->
-        if List.mem r.repo_name failed then rt, done_upgrade else
-        let def =
-          OpamRepositoryName.Map.find r.repo_name rt.repos_definitions
-        in
-        let need_upgrade = match OpamFile.Repo.opam_version def with
-          | None ->
-            OpamConsole.note
-              "Repository at %s doesn't define its version, assuming it's 1.2."
-              (OpamUrl.to_string r.repo_url);
-            true
-          | Some v when
-              OpamVersion.compare v OpamAdminRepoUpgrade.upgradeto_version < 0
-            -> true
-          | _ -> false
-        in
-        if need_upgrade then
-          (if not done_upgrade then
-             (OpamConsole.header_msg
-                "Upgrading repositories from older opam format";
-              OpamRepositoryState.Cache.remove ());
-           OpamConsole.msg "Upgrading repository \"%s\"...\n"
-             (OpamRepositoryName.to_string r.repo_name);
-           let open OpamProcess.Job.Op in
-           let repo_root = OpamRepositoryState.get_repo_root rt r in
-           OpamAdminRepoUpgrade.do_upgrade repo_root;
-           if OpamRepositoryConfig.(!r.repo_tarring) then
-             OpamProcess.Job.run
-               (OpamFilename.make_tar_gz_job
-                  (OpamRepositoryPath.tar rt.repos_global.root r.repo_name)
-                  repo_root
-                @@| function
-                | Some e ->
-                  Printf.ksprintf failwith
-                    "Failed to regenerate local repository archive: %s"
-                    (Printexc.to_string e)
-                | None -> ());
-           let def =
-             OpamFile.Repo.safe_read (OpamRepositoryPath.repo repo_root) |>
-             OpamFile.Repo.with_root_url r.repo_url
-           in
-           let opams =
-             OpamRepositoryState.load_opams_from_dir r.repo_name repo_root
-           in
-           let rt = {
-             rt with
-             repos_definitions =
-               OpamRepositoryName.Map.add r.repo_name def rt.repos_definitions;
-             repo_opams =
-               OpamRepositoryName.Map.add r.repo_name opams rt.repo_opams;
-           } in
-           rt, true)
-        else rt, done_upgrade)
+        if OpamStd.List.mem OpamRepositoryName.equal r.repo_name failed then
+          rt, done_upgrade
+        else
+          let def =
+            OpamRepositoryName.Map.find r.repo_name rt.repos_definitions
+          in
+          let need_upgrade = match OpamFile.Repo.opam_version def with
+            | None ->
+              OpamConsole.note
+                "Repository at %s doesn't define its version, assuming it's 1.2."
+                (OpamUrl.to_string r.repo_url);
+              true
+            | Some v when
+                OpamVersion.compare v OpamAdminRepoUpgrade.upgradeto_version < 0
+              -> true
+            | _ -> false
+          in
+          if need_upgrade then
+            (if not done_upgrade then
+               (OpamConsole.header_msg
+                  "Upgrading repositories from older opam format";
+                OpamRepositoryState.Cache.remove ());
+             OpamConsole.msg "Upgrading repository \"%s\"...\n"
+               (OpamRepositoryName.to_string r.repo_name);
+             let open OpamProcess.Job.Op in
+             let repo_root = OpamRepositoryState.get_repo_root rt r in
+             OpamAdminRepoUpgrade.do_upgrade repo_root;
+             if OpamRepositoryConfig.(!r.repo_tarring) then
+               OpamProcess.Job.run
+                 (OpamFilename.make_tar_gz_job
+                    (OpamRepositoryPath.tar rt.repos_global.root r.repo_name)
+                    repo_root
+                  @@| function
+                  | Some e ->
+                    Printf.ksprintf failwith
+                      "Failed to regenerate local repository archive: %s"
+                      (Printexc.to_string e)
+                  | None -> ());
+             let def =
+               OpamFile.Repo.safe_read (OpamRepositoryPath.repo repo_root) |>
+               OpamFile.Repo.with_root_url r.repo_url
+             in
+             let opams =
+               OpamRepositoryState.load_opams_from_dir r.repo_name repo_root
+             in
+             let rt = {
+               rt with
+               repos_definitions =
+                 OpamRepositoryName.Map.add r.repo_name def rt.repos_definitions;
+               repo_opams =
+                 OpamRepositoryName.Map.add r.repo_name opams rt.repo_opams;
+             } in
+             rt, true)
+          else rt, done_upgrade)
       (rt, false) repos
   in
   if done_upgrade then OpamRepositoryState.Cache.save rt;

src/client/opamSolution.ml

@@ -937,7 +937,10 @@ let parallel_apply t
       (* Cleanup build/install actions when one of them failed, it's verbose and
          doesn't add information *)
       let successful =
-        let was_successful p = not @@ List.mem (`Install p) failed in
+        let was_successful p =
+          not (OpamStd.List.mem (OpamTypesBase.action_equal OpamPackage.equal)
+                 (`Install p) failed)
+        in
         List.filter (function
             | `Fetch ps -> List.for_all was_successful ps
             | `Build p -> was_successful p
@@ -947,10 +950,12 @@ let parallel_apply t
       let remaining =
         List.filter (function
             | `Remove p | `Install p
-              when List.mem (`Build p) failed -> false
+              when
+                OpamStd.List.mem (OpamTypesBase.action_equal OpamPackage.equal)
+                  (`Build p) failed -> false
             | `Remove p | `Install p | `Build p
               when List.exists (function
-                  | `Fetch ps -> List.mem p ps
+                  | `Fetch ps -> OpamStd.List.mem OpamPackage.equal p ps
                   | _ -> false) failed
               -> false
             | `Build _ | `Change _ | `Fetch _ | `Install _
@@ -960,7 +965,10 @@ let parallel_apply t
       let removes_missing_source =
         List.filter (function
             | `Remove p as rem ->
-              let is_fetch = function `Fetch ps -> List.mem p ps | _ -> false in
+              let is_fetch = function
+                | `Fetch ps -> OpamStd.List.mem OpamPackage.equal p ps
+                | _ -> false
+              in
               List.exists is_fetch failed
               && PackageActionGraph.fold_edges (fun v v' mem ->
                   mem || (is_fetch v && PackageAction.equal v' rem))
@@ -975,8 +983,12 @@ let parallel_apply t
         List.filter (function
             | `Fetch _ as a ->
               let succ = PackageActionGraph.succ action_graph a in
-              not (List.for_all (fun a -> List.mem a removes_missing_source)
-                     succ)
+              not (
+                List.for_all (fun a ->
+                    OpamStd.List.mem
+                      (OpamTypesBase.action_equal OpamPackage.equal)
+                      a removes_missing_source)
+                  succ)
             | `Build _ | `Change _ | `Install _ | `Reinstall _
             | `Remove _ -> true)
           failed
@@ -985,7 +997,10 @@ let parallel_apply t
         if l = [] then PackageActionGraph.create () else
         let g = PackageActionGraph.copy action_graph in
         PackageActionGraph.iter_vertex (fun v ->
-            if not (List.mem v l) then PackageActionGraph.remove_vertex g v)
+            if not (OpamStd.List.mem
+                      (OpamTypesBase.action_equal OpamPackage.equal)
+                      v l) then
+              PackageActionGraph.remove_vertex g v)
           g;
         g
       in