Dune preliminaries: remove unused opens

src/batBool.ml

@@ -19,10 +19,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *)
 
-
-open BatNumber
-
-module BaseBool = struct
+module BaseBool : BatNumber.NUMERIC_BASE with type t = bool = struct
   type t = bool
   external not : bool -> bool = "%boolnot"
   (** The boolean negation. *)
@@ -36,6 +33,7 @@ module BaseBool = struct
   (** The boolean ``or''. Evaluation is sequential, left-to-right:
       in [e1 || e2], [e1] is evaluated first, and if it returns [true],
       [e2] is not evaluated at all. *)
+
   let zero, one = false, true
   let neg = not
 

src/batBuffer.mlv

@@ -21,7 +21,6 @@
  *)
 
 
-open BatString
 include Buffer
 
 (** The underlying buffer type. *)

src/batFloat.ml

@@ -19,7 +19,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *)
 
-
 open BatNumber
 
 module BaseFloat = struct

src/batGc.ml

@@ -19,7 +19,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *)
 
-
 open BatPrintf
 include Gc
 

src/batGenlex.ml

@@ -307,7 +307,9 @@ struct
   module Make (M:Definition) =
   struct
     open M
+
     (** {6 Case management} *)
+
     let char =
       if case_sensitive then char
       else                   case_char
@@ -325,6 +327,7 @@ struct
       else BatString.icompare
 
     (** {6 Whitespace management} *)
+
     let line_comment =
       match line_comment_start with
       | None   -> fail
@@ -386,6 +389,7 @@ struct
       return r
 
     (** {6 Actual content} *)
+
     let identifier_content = either [ident_start >:: zero_plus ident_letter ;
                                      op_start    >:: zero_plus op_letter]
 

src/batHashtbl.mli

@@ -34,8 +34,6 @@
     @author David Teller
 *)
 
-open Hashtbl
-
 type ('a, 'b) t = ('a, 'b) Hashtbl.t
 (** A Hashtable with keys of type 'a and values 'b *)
 

src/batHashtbl.mlv

@@ -90,7 +90,7 @@ let enum h =
     let hdata = ref idata in
     let hcount = ref icount in
     let force() =
-      (** this is a hack in order to keep an O(1) enum constructor **)
+      (* this is a hack in order to keep an O(1) enum constructor **)
       if !hcount = -1 then (
         hcount := (h_conv h).size;
         hdata := Array.copy (h_conv h).data;

src/batIO.mli

@@ -98,8 +98,6 @@
     @documents BatInnerIO
 *)
 
-open BatInnerIO
-
 type input = BatInnerIO.input
 (** The abstract input type. *)
 

src/batLazyList.ml

@@ -53,9 +53,9 @@ let get l = match next l with
 let peek l = match next l with
   | Nil         -> None
   | Cons (x, _) -> Some x
-(**
-   {6 Constructors}
-*)
+
+(** {6 Constructors} *)
+
 let from_while f =
   let rec aux () = lazy (
     match f () with

src/batList.mlv

@@ -1579,8 +1579,6 @@ end
 
 
 module Labels = struct
-
-  type 'a t         = 'a list
   let init i ~f     = init i f
   let make n  x     = make n x
   let iteri ~f l    = iteri f l

src/batMap.ml

@@ -991,8 +991,9 @@ sig
   val to_seq_from :  key -> 'a t -> (key * 'a) BatSeq.t
   val add_seq : (key * 'a) BatSeq.t -> 'a t -> 'a t
   val of_seq : (key * 'a) BatSeq.t -> 'a t
-  (** {6 Boilerplate code}*)
+
   (** {7 Printing}*)
+
   val print :  ?first:string -> ?last:string -> ?sep:string -> ?kvsep:string ->
     ('a BatInnerIO.output -> key -> unit) ->
     ('a BatInnerIO.output -> 'c -> unit) ->

src/batOrd.mli

@@ -122,6 +122,7 @@ val bin_ord : 'a ord -> 'a -> 'a -> 'b ord -> 'b -> 'b -> order
     [bin_ord ord1 v1 v1' ord2 v2 v2'] is [ord2 v2 v2'] if [ord1 v1 v1' = Eq],
     and [ord1 v1 v1'] otherwise.
 *)
+
 val bin_eq : 'a eq -> 'a -> 'a -> 'b eq -> 'b -> 'b -> bool
 
 val map_eq : ('a -> 'b) -> 'b eq -> 'a eq

src/batParserCo.ml

@@ -1,5 +1,4 @@
 open BatList
-open BatString
 open List
 open BatLazyList
 open BatIO
@@ -32,12 +31,10 @@ struct
   let of_enum l =
     of_lazy_list (of_enum l)
 
-  open Lexing
-
   (**TODO: Handle EOF !*)
   let of_lexer _l = assert false
   (**    LazyList.of_enum (BatEnum.from (fun () ->
-
+             let open Lexing in
              l.refill_buff l;
                 (l.lex_buffer, (l.lex_start_p, l.lex_curr_p))))*)
 

src/batPathGen.ml

@@ -204,6 +204,7 @@ module type PathType = sig
 
      {e Windows:} If single dot is next to root, it is preserved.
   *)
+
   val normalize_in_graph : t -> t
   (** Another name for {!normalize_filepath}. *)
 

src/batPrintf.mlv

@@ -490,7 +490,7 @@ let kbprintf2 k buf fmt =
   mkprintf (fun _out -> k buf) out fmt
 let sprintf2 fmt = ksprintf2 (identity) fmt
 let bprintf2 buf fmt = kbprintf2 ignore buf fmt
-(**
+(*
    Other possible implementation of [sprintf2],
    left as example:
 
@@ -500,7 +500,7 @@ let bprintf2 buf fmt = kbprintf2 ignore buf fmt
     mkprintf (fun out -> close_out out) out fmt
    ]
 *)
-(**
+(*
    Other possible implementation of [bprintf2],
    left as example:
    [

src/batString.mliv

@@ -49,8 +49,6 @@
     @author Edgar Friendly
 *)
 
-open String
-
 val init : int -> (int -> char) -> string
 (** [init l f] returns the string of length [l] with the chars
     f 0 , f 1 , f 2 ... f (l-1).

src/batUnix.mliv

@@ -19,8 +19,6 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  *)
 
-open BatConcurrent
-
 (** Low-level interface to the operating system (both Unix and Windows).
 
     This module only provides low-level functions and types. Unless you
@@ -347,8 +345,6 @@ val single_write_substring : file_descr -> string -> int -> int -> int
 
 (** {6 Interfacing with the standard input/output library} *)
 
-open BatInnerIO
-
 val in_channel_of_descr : file_descr -> in_channel
 (** Create an input channel reading from the given descriptor.
     The channel is initially in binary mode; use

testsuite/test_mapfunctors.ml

@@ -1,6 +1,5 @@
 open OUnit
 open BatRandom
-open BatPervasives
 
 module MkTest (MkMap : functor (Ord : BatInterfaces.OrderedType)
                  -> BatMap.S with type key = Ord.t) =

testsuite/test_random.ml

@@ -1,5 +1,4 @@
 open OUnit
-open BatPervasives
 
 let assert_equal_arrays =
   assert_equal ~printer:(BatIO.to_string (BatArray.print BatInt.print))

toplevel/batteriesHelp.ml

@@ -299,8 +299,8 @@ let man_all sources ~tabs subject =
     else
       match
         List.fold_left
-          (fun (((result_as_strings : string list)(**The text to display, as a list of strings, one string per kind.*),
-            _one_suggestion    (**The latest suggestion -- used only in case there's only one suggestion.*)) as acc)
+          (fun (((result_as_strings : string list)(*The text to display, as a list of strings, one string per kind.*),
+            _one_suggestion    (*The latest suggestion -- used only in case there's only one suggestion.*)) as acc)
             (cmd, kind, singular, plural, _undefined) ->
             match man_aux ~kind ~singular ~plural subject with
             | `No_result                -> acc