Merge branch 'master' into little-cleanups

src/action.ml

@@ -10,16 +10,10 @@ module Outputs = struct
     | Outputs -> "outputs"
 end
 
-module type Sexpable = sig
-  type t
-  val t : t Sexp.Of_sexp.t
-  val sexp_of_t : t Sexp.To_sexp.t
-end
-
 module Make_ast
-    (Program : Sexpable)
+    (Program : Sexp.Sexpable)
-    (Path    : Sexpable)
+    (Path    : Sexp.Sexpable)
-    (String  : Sexpable)
+    (String  : Sexp.Sexpable)
     (Ast : Action_intf.Ast
      with type program := Program.t
      with type path    := Path.t
@@ -676,7 +670,7 @@ module Promotion = struct
   let do_promote db =
     let by_targets = group_by_targets db  in
     let potential_build_contexts =
-      match Path.readdir Path.build_dir with
+      match Path.readdir_unsorted Path.build_dir with
       | exception _ -> []
       | files ->
         List.filter_map files ~f:(fun fn ->

src/action.mli

@@ -87,8 +87,7 @@ module Unexpanded : sig
     with type path    := String_with_vars.t
     with type string  := String_with_vars.t
 
-  val t : t Sexp.Of_sexp.t
+  include Sexp.Sexpable with type t := t
-  val sexp_of_t : t Sexp.To_sexp.t
 
   module Partial : sig
     include Action_intf.Ast

src/build_system.ml

@@ -408,7 +408,7 @@ let get_dir_status t ~dir =
       Dir_status.Loaded Path.Set.empty
     else if not (Path.is_local dir) then
       Dir_status.Loaded
-        (match Path.readdir dir with
+        (match Path.readdir_unsorted dir with
          | exception _ -> Path.Set.empty
          | files ->
            Path.Set.of_list (List.map files ~f:(Path.relative dir)))
@@ -637,7 +637,7 @@ let remove_old_artifacts t ~dir ~subdirs_to_keep =
      Hashtbl.mem t.files (Path.relative dir Config.jbuilder_keep_fname) then
     ()
   else
-    match Path.readdir dir with
+    match Path.readdir_unsorted dir with
     | exception _ -> ()
     | files ->
       List.iter files ~f:(fun fn ->

src/file_tree.ml

@@ -180,7 +180,7 @@ let load ?(extra_ignored_subtrees=Path.Set.empty) path =
   let rec walk path ~dirs_visited ~project ~ignored : Dir.t =
     let contents = lazy (
       let files, sub_dirs =
-        Path.readdir path
+        Path.readdir_unsorted path
         |> List.filter_partition_map ~f:(fun fn ->
           let path = Path.relative path fn in
           let is_directory, file =

src/installed_dune_file.ml

@@ -3,7 +3,7 @@ open Import
 let parse_sub_systems sexps =
   List.filter_map sexps ~f:(fun sexp ->
     let name, ver, data =
-      Sexp.Of_sexp.(triple string (located Syntax.Version.t_of_sexp) raw) sexp
+      Sexp.Of_sexp.(triple string (located Syntax.Version.t) raw) sexp
     in
     match Sub_system_name.get name with
     | None ->

src/ordered_set_lang.mli

@@ -52,8 +52,8 @@ val is_standard : t -> bool
 module Unexpanded : sig
   type expanded = t
   type t
-  val t : t Sexp.Of_sexp.t
+
-  val sexp_of_t : t Sexp.To_sexp.t
+  include Sexp.Sexpable with type t := t
   val standard : t
 
   val field : ?default:t -> string -> t Sexp.Of_sexp.record_parser

src/stdune/path.ml

@@ -465,7 +465,7 @@ let explode_exn t =
 let exists t =
   try Sys.file_exists (to_string t)
   with Sys_error _ -> false
-let readdir t = Sys.readdir (to_string t) |> Array.to_list
+let readdir_unsorted t = Sys.readdir (to_string t) |> Array.to_list
 let is_directory t =
   try Sys.is_directory (to_string t)
   with Sys_error _ -> false

src/stdune/path.mli

@@ -128,7 +128,7 @@ val split_first_component : t -> (string * t) option
 val insert_after_build_dir_exn : t -> string -> t
 
 val exists : t -> bool
-val readdir : t -> string list
+val readdir_unsorted : t -> string list
 val is_directory : t -> bool
 val rmdir : t -> unit
 val unlink : t -> unit

src/stdune/sexp.ml

@@ -452,3 +452,9 @@ module Of_sexp = struct
                     String.uncapitalize name) }
           "Unknown value %s" s
 end
+
+module type Sexpable = sig
+  type t
+  val t : t Of_sexp.t
+  val sexp_of_t : t To_sexp.t
+end

src/stdune/sexp.mli

@@ -169,3 +169,9 @@ module Of_sexp : sig
 
   val enum : (string * 'a) list -> 'a t
 end
+
+module type Sexpable = sig
+  type t
+  val t : t Of_sexp.t
+  val sexp_of_t : t To_sexp.t
+end

src/syntax.ml

@@ -7,7 +7,7 @@ module Version = struct
 
   let sexp_of_t t = Sexp.unsafe_atom_of_string (to_string t)
 
-  let t_of_sexp : t Sexp.Of_sexp.t = function
+  let t : t Sexp.Of_sexp.t = function
     | Atom (loc, A s) -> begin
         try
           Scanf.sscanf s "%u.%u" (fun a b -> (a, b))

src/syntax.mli

@@ -9,8 +9,7 @@ module Version : sig
       [Z <= Y]. *)
   type t = int * int
 
-  val sexp_of_t : t Sexp.To_sexp.t
+  include Sexp.Sexpable with type t := t
-  val t_of_sexp : t Sexp.Of_sexp.t
 
   (** Whether the parser can read the data or not *)
   val can_read : parser_version:t -> data_version:t -> bool