mina_stdlib: port to 5.2.1

Author: glyh

src/lib/mina_stdlib/bigstring.ml

@@ -1,4 +1,4 @@
-open Core_kernel
+open Core
 
 (* add functions to library module Bigstring so we can derive hash for the type t below *)
 

src/lib/mina_stdlib/bigstring.mli

@@ -3,7 +3,7 @@ open Core
 [%%versioned:
 module Stable : sig
   module V1 : sig
-    type t = Core_kernel.Bigstring.Stable.V1.t [@@deriving sexp, compare]
+    type t = Bigstring.Stable.V1.t [@@deriving sexp, compare]
 
     include Binable.S with type t := t
 

src/lib/mina_stdlib/bounded_types.ml

@@ -1,5 +1,5 @@
-open Core_kernel
-open Core_kernel.Hash.Builtin
+open Core
+open Hash.Builtin
 
 module N16 = struct
   let max_array_len = 16
@@ -21,7 +21,7 @@ struct
 
       let hash_fold_t = hash_fold_array_frozen
 
-      [%%define_locally Core_kernel.Array.(compare, equal)]
+      [%%define_locally Array.(compare, equal)]
 
       let to_latest s = s
 
@@ -66,7 +66,7 @@ module String = struct
 
       let to_latest s = s
 
-      [%%define_locally Core_kernel.String.(compare, equal)]
+      [%%define_locally String.(compare, equal)]
 
       let hash = hash_string
 
@@ -141,20 +141,18 @@ end
 module Wrapped_error = struct
   module Stable = struct
     module V1 = struct
-      type t = Core_kernel.Error.Stable.V2.t [@@deriving sexp]
+      type t = Error.Stable.V2.t [@@deriving sexp]
 
       let __versioned__ = ()
 
-      let to_latest = Core_kernel.Fn.id
+      let to_latest = Fn.id
 
       include String.Of_stringable (struct
         type nonrec t = t
 
-        let to_string (s : t) =
-          Core_kernel.Error.sexp_of_t s |> Core_kernel.Sexp.to_string_mach
+        let to_string (s : t) = Error.sexp_of_t s |> Sexp.to_string_mach
 
-        let of_string s =
-          Core_kernel.Error.t_of_sexp (Core_kernel.Sexp.of_string s)
+        let of_string s = Error.t_of_sexp (Sexp.of_string s)
       end)
     end
   end

src/lib/mina_stdlib/deferred.ml

@@ -1,4 +1,4 @@
-open Core_kernel
+open Core
 open Async_kernel
 
 include (
@@ -34,15 +34,15 @@ module Result = struct
     open Deferred.Result.Let_syntax
 
     let fold ls ~init ~f =
-      Core_kernel.List.fold ls ~init:(return init) ~f:(fun acc x ->
+      Core.List.fold ls ~init:(return init) ~f:(fun acc x ->
           let%bind acc' = acc in
           f acc' x )
 
     let map ls ~f =
       fold ls ~init:[] ~f:(fun acc x ->
           let%map x' = f x in
           x' :: acc )
-      >>| Core_kernel.List.rev
+      >>| Core.List.rev
 
     let iter ls ~f = fold ls ~init:() ~f:(fun () -> f)
   end

src/lib/mina_stdlib/deferred.mli

@@ -1,4 +1,4 @@
-open Core_kernel
+open Core
 open Async_kernel
 
 include module type of Deferred with module Result := Deferred.Result

src/lib/mina_stdlib/direction.ml

@@ -1,4 +1,4 @@
-open Core_kernel
+open Core
 
 type t = Left | Right [@@deriving sexp, equal]
 

src/lib/mina_stdlib/dune

@@ -15,6 +15,8 @@
   result
   sexplib0
   stdlib
+  core
+  core_kernel ; ppx deriving in Time/Bigstring still needs core_kernel, need to figure out how to remove it.
   ; local libraries
   ppx_version.runtime)
  (instrumentation

src/lib/mina_stdlib/empty_hashes.ml

@@ -1,4 +1,4 @@
-open Core_kernel
+open Core
 
 module type Hash_intf = sig
   type t
@@ -14,10 +14,10 @@ let cache hash_mod ~init_hash depth =
   let last_hash = ref init_hash in
   Immutable_array.of_array
   @@ Array.init (depth + 1) ~f:(fun i ->
-         if Int.equal i 0 then !last_hash
-         else (
-           last_hash := merge_hash hash_mod (i - 1) !last_hash ;
-           !last_hash ) )
+      if Int.equal i 0 then !last_hash
+      else (
+        last_hash := merge_hash hash_mod (i - 1) !last_hash ;
+        !last_hash ) )
 
 let extensible_cache hash_mod ~init_hash =
   let empty_hashes = ref [| init_hash |] in
@@ -26,10 +26,10 @@ let extensible_cache hash_mod ~init_hash =
     let height = Array.length prev - 1 in
     let deficit = i - height in
     ( if deficit > 0 then
-      let last_hash = ref (Array.last prev) in
-      empty_hashes :=
-        Array.append prev
-          (Array.init deficit ~f:(fun i ->
-               last_hash := merge_hash hash_mod (i + height) !last_hash ;
-               !last_hash ) ) ) ;
+        let last_hash = ref (Array.last prev) in
+        empty_hashes :=
+          Array.append prev
+            (Array.init deficit ~f:(fun i ->
+                 last_hash := merge_hash hash_mod (i + height) !last_hash ;
+                 !last_hash ) ) ) ;
     !empty_hashes.(i)

src/lib/mina_stdlib/gadt.ml

@@ -1,3 +1,5 @@
+open Core
+
 module Peano = struct
   type zero = unit
 
@@ -68,8 +70,8 @@ module Vect = struct
   let rec map : type n. f:('a -> 'b) -> ('a, n) t -> ('b, n) t =
    fun ~f ls -> match ls with [] -> [] | h :: t -> f h :: map ~f t
 
-  let rec map2 :
-      type n. f:('a -> 'b -> 'c) -> ('a, n) t -> ('b, n) t -> ('c, n) t =
+  let rec map2 : type n.
+      f:('a -> 'b -> 'c) -> ('a, n) t -> ('b, n) t -> ('c, n) t =
    fun ~f ls_a ls_b ->
     match (ls_a, ls_b) with
     | [], [] ->
@@ -81,9 +83,8 @@ module Vect = struct
    fun ~init ~f ls ->
     match ls with [] -> init | h :: t -> fold ~init:(f init h) ~f t
 
-  let rec fold_map :
-      type n. init:'b -> f:('b -> 'a -> 'b * 'c) -> ('a, n) t -> 'b * ('c, n) t
-      =
+  let rec fold_map : type n.
+      init:'b -> f:('b -> 'a -> 'b * 'c) -> ('a, n) t -> 'b * ('c, n) t =
    fun ~init ~f ls ->
     match ls with
     | [] ->
@@ -94,11 +95,11 @@ module Vect = struct
         (init'', h' :: t')
 
   module Quickcheck_generator = struct
-    open Core_kernel.Quickcheck
+    open Quickcheck
     open Generator.Let_syntax
 
-    let rec map :
-        type n. f:('a -> 'b Generator.t) -> ('a, n) t -> ('b, n) t Generator.t =
+    let rec map : type n.
+        f:('a -> 'b Generator.t) -> ('a, n) t -> ('b, n) t Generator.t =
      fun ~f ls ->
       match ls with
       | [] ->

src/lib/mina_stdlib/gadt.mli

@@ -1,3 +1,5 @@
+open Core
+
 module Peano : sig
   type zero = unit
 
@@ -68,8 +70,8 @@ module Vect : sig
 
   module Quickcheck_generator : sig
     val map :
-         f:('a -> 'b Core_kernel.Quickcheck.Generator.t)
+         f:('a -> 'b Quickcheck.Generator.t)
       -> ('a, 'n) t
-      -> ('b, 'n) t Core_kernel.Quickcheck.Generator.t
+      -> ('b, 'n) t Quickcheck.Generator.t
   end
 end