[sledge] Rename nonstdlib/{map,set} to nonstdlib/{NSMap,NSSet}

Reviewed By: ngorogiannis

Differential Revision: D26250537

fbshipit-source-id: ff1dc3751

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

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"]
 

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]

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]

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]

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]

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)

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

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

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)

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