From 9326f47ba2c47dd04e0e02f981ce3b7389bb9678 Mon Sep 17 00:00:00 2001
From: Rhiannon Morris <rhi@rhiannon.website>
Date: Sun, 6 Dec 2020 10:15:56 +0100
Subject: [PATCH] move Set_ext to just Set

---
 day1.ml              |  2 +-
 day4.ml              |  2 +-
 day6.ml              |  2 +-
 set_ext.ml => set.ml |  8 +++++---
 set.mli              | 10 ++++++++++
 set_ext.mli          |  8 --------
 6 files changed, 18 insertions(+), 14 deletions(-)
 rename set_ext.ml => set.ml (69%)
 create mode 100644 set.mli
 delete mode 100644 set_ext.mli

diff --git a/day1.ml b/day1.ml
index a2b8b4b..6b0ceaa 100644
--- a/day1.ml
+++ b/day1.ml
@@ -1,4 +1,4 @@
-module IntSet = Set_ext.Make(Int)
+module IntSet = Set.Make(Int)
 
 let read_ints =
   Bracket.infile_lines ~line:int_of_string ~of_seq:IntSet.of_seq
diff --git a/day4.ml b/day4.ml
index 5449f0f..bb52f3d 100644
--- a/day4.ml
+++ b/day4.ml
@@ -17,7 +17,7 @@ let%test_module _ = (module struct
 end)
 
 
-module StrSet = Set_ext.Make(String)
+module StrSet = Set.Make(String)
 
 let optional_fields = StrSet.singleton "cid"
 
diff --git a/day6.ml b/day6.ml
index ba17e07..0d60fb8 100644
--- a/day6.ml
+++ b/day6.ml
@@ -1,4 +1,4 @@
-module CharSet = Set_ext.Make(Char)
+module CharSet = Set.Make(Char)
 
 let to_set str = String.to_seq str |> CharSet.of_seq
 
diff --git a/set_ext.ml b/set.ml
similarity index 69%
rename from set_ext.ml
rename to set.ml
index 2920ad0..8cea362 100644
--- a/set_ext.ml
+++ b/set.ml
@@ -1,10 +1,12 @@
+module type OrderedType = Stdlib.Set.OrderedType
+
 module type S = sig
-  include Set.S
+  include Stdlib.Set.S
   val exists_opt: (elt -> 'a option) -> t -> 'a option
 end
 
-module Make(Elt: Set.OrderedType) = struct
-  include Set.Make(Elt)
+module Make(Elt: OrderedType) = struct
+  include Stdlib.Set.Make(Elt)
 
   let exists_opt (type a) (f: elt -> a option) set =
     let exception Found of a in
diff --git a/set.mli b/set.mli
new file mode 100644
index 0000000..621e594
--- /dev/null
+++ b/set.mli
@@ -0,0 +1,10 @@
+module type OrderedType = Stdlib.Set.OrderedType
+
+module type S = sig
+  include Stdlib.Set.S
+  val exists_opt: (elt -> 'a option) -> t -> 'a option
+end
+
+module Make(Elt: OrderedType): S
+  with type elt = Elt.t
+   and type t   = Stdlib.Set.Make(Elt).t
diff --git a/set_ext.mli b/set_ext.mli
deleted file mode 100644
index 7702815..0000000
--- a/set_ext.mli
+++ /dev/null
@@ -1,8 +0,0 @@
-module type S = sig
-  include Set.S
-  val exists_opt: (elt -> 'a option) -> t -> 'a option
-end
-
-module Make(Elt: Set.OrderedType): S
-  with type elt = Elt.t
-   and type t   = Set.Make(Elt).t