filename: rename and deprecated mk_tmp_dir in favor to tmp_dir

src/client/opamCommands.ml

@@ -2518,7 +2518,9 @@ let repository cli =
                 to retrieve a consistent state."
                (OpamRepositoryName.to_string name);
            let target =
-             OpamFilename.(Op.(tmp_dir / Base.to_string (basename_dir dir)))
+             let open OpamFilename.Op in
+             tmp_dir / OpamFilename.Base.to_string
+               (OpamFilename.basename_dir dir)
            in
            OpamFilename.copy_dir ~src:dir ~dst:target;
            fun () -> OpamFilename.copy_dir ~src:target ~dst:dir)

src/core/opamFilename.ml

@@ -60,9 +60,12 @@ end
 
 let raw_dir s = s
 
-let mk_tmp_dir () =
+let tmp_dir () =
   Dir.of_string @@ OpamSystem.mk_temp_dir ()
 
+[@@deprecated "use tmp_dir instead"]
+let mk_tmp_dir = tmp_dir
+
 let with_tmp_dir fn =
   OpamSystem.with_tmp_dir (fun dir -> fn (Dir.of_string dir))
 

src/core/opamFilename.mli

@@ -106,7 +106,9 @@ val with_tmp_dir: (Dir.t -> 'a) -> 'a
 val with_tmp_dir_job: (Dir.t -> 'a OpamProcess.job) -> 'a OpamProcess.job
 
 (** Raw function to create a temporary directory. No automatic cleanup *)
+val tmp_dir: unit -> Dir.t
 val mk_tmp_dir: unit -> Dir.t
+[@@deprecated "use tmp_dir instead"]
 
 (** Create a new Dir.t and resolve symlinks *)
 val concat_and_resolve: Dir.t -> string -> Dir.t

src/state/opamPackageVar.ml

@@ -317,7 +317,7 @@ let resolve st ?opam:opam_arg ?(local=OpamVariable.Map.empty) v =
         ret (OpamPath.Switch.Overlay.opam st.switch_global.root st.switch (OpamPackage.name nv))
       else if OpamPackage.Set.mem nv st.packages then
         let opam = OpamPackage.Map.find nv st.opams in
-        let temp_dir = OpamFilename.mk_tmp_dir () in
+        let temp_dir = OpamFilename.tmp_dir () in
         let dest = OpamFile.make OpamFilename.Op.(temp_dir // "opam") in
         OpamFile.OPAM.write dest opam;
         ret dest

src/state/opamRepositoryState.ml

@@ -172,7 +172,7 @@ let load lock_kind gt =
     repo_trust = ta;
   } in
   let repositories = OpamRepositoryName.Map.mapi mk_repo repos_map in
-  let repos_tmp_root = lazy (OpamFilename.mk_tmp_dir ()) in
+  let repos_tmp_root = lazy (OpamFilename.tmp_dir ()) in
   let repos_tmp = Hashtbl.create 23 in
   OpamRepositoryName.Map.iter (fun name repo ->
       let uncompressed_root = OpamRepositoryPath.root gt.root repo.repo_name in