Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)
1diff --git a/app/cfstream_test.ml b/app/cfstream_test.ml 2index 457c5e5..c6a01a5 100644 3--- a/app/cfstream_test.ml 4+++ b/app/cfstream_test.ml 5@@ -73,7 +73,7 @@ let test_uncombine () = 6 let test_partition () = 7 let f x = x mod 2 = 0 in 8 let l = List.init 100 ~f:(fun _ -> Random.int 10) in 9- let r1 = Caml.List.partition f l in 10+ let r1 = Stdlib.List.partition f l in 11 let r2 = of_list l |> partition ~f |> fun (a, b) -> to_list a, to_list b in 12 assert_equal 13 ~printer:int_list_tuple_printer 14diff --git a/lib/CFStream_stream.ml b/lib/CFStream_stream.ml 15index 25c0e5a..835791c 100644 16--- a/lib/CFStream_stream.ml 17+++ b/lib/CFStream_stream.ml 18@@ -83,7 +83,7 @@ let find xs ~f = find_map xs ~f:(fun x -> if f x then Some x else None) 19 let find_exn xs ~f = 20 match find xs ~f with 21 | Some x -> x 22- | None -> raise Caml.Not_found 23+ | None -> raise Stdlib.Not_found 24 ;; 25 26 let exists xs ~f = 27@@ -287,7 +287,7 @@ let group_aux xs map eq = 28 ;; 29 30 let group xs ~f = group_aux xs f Poly.( = ) 31-let group_by xs ~eq = group_aux xs ident eq 32+let group_by xs ~eq = group_aux xs Fn.id eq 33 34 let chunk2 xs = 35 from (fun _ -> 36@@ -615,11 +615,11 @@ let to_hashtbl xs = 37 let of_map t = of_list (Map.to_alist t) 38 39 let to_map xs = 40- fold xs ~init:Map.Poly.empty ~f:(fun accu (key, data) -> Map.Poly.set accu ~key ~data) 41+ fold xs ~init:Map.Poly.empty ~f:(fun accu (key, data) -> Map.set accu ~key ~data) 42 ;; 43 44 let of_set t = of_list (Set.to_list t) 45-let to_set xs = fold xs ~init:Set.Poly.empty ~f:(fun accu e -> Set.Poly.add accu e) 46+let to_set xs = fold xs ~init:Set.Poly.empty ~f:(fun accu e -> Set.add accu e) 47 48 module Infix = struct 49 let ( -- ) x y = range x ~until:y 50@@ -660,7 +660,7 @@ module Result = struct 51 | M.E e -> Result.Error e 52 ;; 53 54- let all xs ~f = all_gen ident xs ~f 55+ let all xs ~f = all_gen Fn.id xs ~f 56 let all' xs ~f = all_gen (fun x -> Ok x) xs ~f 57 let to_exn = result_to_exn 58