Resolving conflicts with injectivity work

Changes

@@ -154,7 +154,8 @@ Working version
   (Thomas Refis, review by Gabriel Scherer)
 
 - #9745: Manual: Standard Library labeled and unlabeled documentation unified
-  (John Whitington, review by Nicolás Ojeda Bär)
+  (John Whitington, review by Nicolás Ojeda Bär, David Allsopp
+   and Thomas Refis)
 
 ### Compiler user-interface and warnings:
 

stdlib/hashtbl.mli

@@ -25,7 +25,7 @@
 (** {1 Generic interface} *)
 
 
-type ('a, 'b) t
+type (!'a, !'b) t
 (** The type of hash tables from type ['a] to type ['b]. *)
 
 val create : ?random: (* thwart tools/unlabel *) bool -> int -> ('a, 'b) t

stdlib/map.mli

@@ -67,7 +67,7 @@ module type S =
     type key
     (** The type of the map keys. *)
 
-    type (!+'a) t
+    and (!+'a) t
     (** The type of maps from type [key] to type ['a]. *)
 
     val empty: 'a t

stdlib/moreLabels.mli

@@ -36,7 +36,7 @@ module Hashtbl : sig
 (** {1 Generic interface} *)
 
 
-type ('a, 'b) t = ('a, 'b) Hashtbl.t
+type (!'a, !'b) t
 (** The type of hash tables from type ['a] to type ['b]. *)
 
 val create : ?random: (* thwart tools/unlabel *) bool -> int -> ('a, 'b) t
@@ -555,7 +555,7 @@ module type S =
     type key
     (** The type of the map keys. *)
 
-    type (!+'a) t
+    and (!+'a) t
     (** The type of maps from type [key] to type ['a]. *)
 
     val empty: 'a t

stdlib/templates/hashtbl.template.mli

@@ -25,7 +25,7 @@
 (** {1 Generic interface} *)
 
 
-type ('a, 'b) t
+type (!'a, !'b) t
 (** The type of hash tables from type ['a] to type ['b]. *)
 
 val create : ?random: (* thwart tools/unlabel *) bool -> int -> ('a, 'b) t

stdlib/templates/map.template.mli

@@ -67,7 +67,7 @@ module type S =
     type key
     (** The type of the map keys. *)
 
-    type (!+'a) t
+    and (!+'a) t
     (** The type of maps from type [key] to type ['a]. *)
 
     val empty: 'a t