From de8d583f82aca4d691400b6168de309751bf328f Mon Sep 17 00:00:00 2001
From: Josh Berdine <jjb@fb.com>
Date: Sun, 21 Feb 2021 13:16:21 -0800
Subject: [PATCH] [sledge] Rename nonstdlib/{map,set} to
 nonstdlib/{NSMap,NSSet}

Reviewed By: ngorogiannis

Differential Revision: D26250537

fbshipit-source-id: ff1dc3751
---
 sledge/nonstdlib/NS.ml                          | 4 ++--
 sledge/nonstdlib/NS.mli                         | 4 ++--
 sledge/nonstdlib/{map.ml => NSMap.ml}           | 2 +-
 sledge/nonstdlib/{map.mli => NSMap.mli}         | 2 +-
 sledge/nonstdlib/{map_intf.ml => NSMap_intf.ml} | 0
 sledge/nonstdlib/{set.ml => NSSet.ml}           | 2 +-
 sledge/nonstdlib/{set.mli => NSSet.mli}         | 2 +-
 sledge/nonstdlib/{set_intf.ml => NSSet_intf.ml} | 0
 sledge/nonstdlib/int.ml                         | 4 ++--
 sledge/nonstdlib/int.mli                        | 4 ++--
 sledge/nonstdlib/multiset.ml                    | 2 +-
 sledge/nonstdlib/string.ml                      | 4 ++--
 sledge/nonstdlib/string.mli                     | 4 ++--
 13 files changed, 17 insertions(+), 17 deletions(-)
 rename sledge/nonstdlib/{map.ml => NSMap.ml} (99%)
 rename sledge/nonstdlib/{map.mli => NSMap.mli} (89%)
 rename sledge/nonstdlib/{map_intf.ml => NSMap_intf.ml} (100%)
 rename sledge/nonstdlib/{set.ml => NSSet.ml} (99%)
 rename sledge/nonstdlib/{set.mli => NSSet.mli} (89%)
 rename sledge/nonstdlib/{set_intf.ml => NSSet_intf.ml} (100%)

diff --git a/sledge/nonstdlib/NS.ml b/sledge/nonstdlib/NS.ml
index 388fefae0..dacbfd770 100644
--- a/sledge/nonstdlib/NS.ml
+++ b/sledge/nonstdlib/NS.ml
@@ -38,13 +38,13 @@ module IArray = IArray
 include IArray.Import
 module Int = Int
 module List = List
-module Map = Map
+module Map = NSMap
 module Monad = Monad
 module Multiset = Multiset
 module Option = Option
 include Option.Import
 module Q = Q_ext
-module Set = Set
+module Set = NSSet
 module Sign = Sign
 module String = String
 module Sys = Sys
diff --git a/sledge/nonstdlib/NS.mli b/sledge/nonstdlib/NS.mli
index ab5bd3b67..a5132404e 100644
--- a/sledge/nonstdlib/NS.mli
+++ b/sledge/nonstdlib/NS.mli
@@ -161,8 +161,8 @@ module List = List
 module Array = Array
 module IArray = IArray
 include module type of IArray.Import
-module Set = Set
-module Map = Map
+module Set = NSSet
+module Map = NSMap
 module Multiset = Multiset
 module Bijection = CCBijection [@@warning "-49"]
 
diff --git a/sledge/nonstdlib/map.ml b/sledge/nonstdlib/NSMap.ml
similarity index 99%
rename from sledge/nonstdlib/map.ml
rename to sledge/nonstdlib/NSMap.ml
index 61d5ab666..de0f426e9 100644
--- a/sledge/nonstdlib/map.ml
+++ b/sledge/nonstdlib/NSMap.ml
@@ -6,7 +6,7 @@
  *)
 
 open! NS0
-include Map_intf
+include NSMap_intf
 
 module Make (Key : sig
   type t [@@deriving compare, sexp_of]
diff --git a/sledge/nonstdlib/map.mli b/sledge/nonstdlib/NSMap.mli
similarity index 89%
rename from sledge/nonstdlib/map.mli
rename to sledge/nonstdlib/NSMap.mli
index 01f652af4..b94fd4b8e 100644
--- a/sledge/nonstdlib/map.mli
+++ b/sledge/nonstdlib/NSMap.mli
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *)
 
-include module type of Map_intf
+include module type of NSMap_intf
 
 module Make (Key : sig
   type t [@@deriving compare, sexp_of]
diff --git a/sledge/nonstdlib/map_intf.ml b/sledge/nonstdlib/NSMap_intf.ml
similarity index 100%
rename from sledge/nonstdlib/map_intf.ml
rename to sledge/nonstdlib/NSMap_intf.ml
diff --git a/sledge/nonstdlib/set.ml b/sledge/nonstdlib/NSSet.ml
similarity index 99%
rename from sledge/nonstdlib/set.ml
rename to sledge/nonstdlib/NSSet.ml
index 92e08c6ab..89a57cd16 100644
--- a/sledge/nonstdlib/set.ml
+++ b/sledge/nonstdlib/NSSet.ml
@@ -6,7 +6,7 @@
  *)
 
 open! NS0
-include Set_intf
+include NSSet_intf
 
 module Make (Elt : sig
   type t [@@deriving compare, sexp_of]
diff --git a/sledge/nonstdlib/set.mli b/sledge/nonstdlib/NSSet.mli
similarity index 89%
rename from sledge/nonstdlib/set.mli
rename to sledge/nonstdlib/NSSet.mli
index 20fed6478..24e0e8852 100644
--- a/sledge/nonstdlib/set.mli
+++ b/sledge/nonstdlib/NSSet.mli
@@ -5,7 +5,7 @@
  * LICENSE file in the root directory of this source tree.
  *)
 
-include module type of Set_intf
+include module type of NSSet_intf
 
 module Make (Elt : sig
   type t [@@deriving compare, sexp_of]
diff --git a/sledge/nonstdlib/set_intf.ml b/sledge/nonstdlib/NSSet_intf.ml
similarity index 100%
rename from sledge/nonstdlib/set_intf.ml
rename to sledge/nonstdlib/NSSet_intf.ml
diff --git a/sledge/nonstdlib/int.ml b/sledge/nonstdlib/int.ml
index 09170fef8..406ff08fe 100644
--- a/sledge/nonstdlib/int.ml
+++ b/sledge/nonstdlib/int.ml
@@ -47,5 +47,5 @@ let sign = Sign.of_int
 let incr = incr
 let decr = decr
 
-module Set = Set.Make (T)
-module Map = Map.Make (T)
+module Set = NSSet.Make (T)
+module Map = NSMap.Make (T)
diff --git a/sledge/nonstdlib/int.mli b/sledge/nonstdlib/int.mli
index 45201fad1..27ecc4c38 100644
--- a/sledge/nonstdlib/int.mli
+++ b/sledge/nonstdlib/int.mli
@@ -40,5 +40,5 @@ module Infix : sig
 end
 
 include module type of Infix
-module Set : Set.S with type elt = int
-module Map : Map.S with type key = int
+module Set : NSSet.S with type elt = int
+module Map : NSMap.S with type key = int
diff --git a/sledge/nonstdlib/multiset.ml b/sledge/nonstdlib/multiset.ml
index 22e40554e..289c2a289 100644
--- a/sledge/nonstdlib/multiset.ml
+++ b/sledge/nonstdlib/multiset.ml
@@ -15,7 +15,7 @@ module Make (Elt : sig
 end)
 (Mul : MULTIPLICITY) =
 struct
-  module M = Map.Make (Elt)
+  module M = NSMap.Make (Elt)
 
   type mul = Mul.t
   type elt = Elt.t
diff --git a/sledge/nonstdlib/string.ml b/sledge/nonstdlib/string.ml
index 50750f4db..1ae40a808 100644
--- a/sledge/nonstdlib/string.ml
+++ b/sledge/nonstdlib/string.ml
@@ -34,6 +34,6 @@ let rindex = rindex_opt
 let rindex_from_exn = rindex_from
 let rindex_from = rindex_from_opt
 
-module Set = Set.Make (T)
-module Map = Map.Make (T)
+module Set = NSSet.Make (T)
+module Map = NSMap.Make (T)
 module Tbl = HashTable.Make (T)
diff --git a/sledge/nonstdlib/string.mli b/sledge/nonstdlib/string.mli
index 0850e399a..e87add1dd 100644
--- a/sledge/nonstdlib/string.mli
+++ b/sledge/nonstdlib/string.mli
@@ -22,6 +22,6 @@ val rtake : int -> string -> string
 val rdrop : int -> string -> string
 val rtake_drop : int -> string -> string * string
 
-module Set : Set.S with type elt = string
-module Map : Map.S with type key = string
+module Set : NSSet.S with type elt = string
+module Map : NSMap.S with type key = string
 module Tbl : HashTable.S with type key = string