remove containers.pervasives, add the module Containers to core/

README.md

@@ -10,7 +10,10 @@ What is _containers_?
   are totally independent and are prefixed with `CC` (for "containers-core"
   or "companion-cube" because I'm megalomaniac). This part should be
   usable and should work. For instance, `CCList` contains functions and
-  lists including safe versions of `map` and `append`.
+  lists including safe versions of `map` and `append`. It also
+  provides a drop-in replacement to the standard library, in the module
+  `Containers` (intended to be opened, replaces some stdlib modules
+  with extended ones)
 - Several small additional libraries that complement it:
   * `containers.data` with additional data structures that don't have an
     equivalent in the standard library;
@@ -21,9 +24,6 @@ What is _containers_?
     KMP search algorithm, and a few naive utils). Again, modules are independent
     and sometimes parametric on the string and char types (so they should
     be able to deal with your favorite unicode library).
-- A drop-in replacement to the standard library, `containers.pervasives`,
-  that defined a `CCPervasives` module intented to be opened to extend some
-  modules of the stdlib.
 - A sub-library with complicated abstractions, `containers.advanced` (with
   a LINQ-like query module, batch operations using GADTs, and others).
 - A library using [Lwt](https://github.com/ocsigen/lwt/), `containers.lwt`.

_oasis

@@ -49,7 +49,8 @@ Library "containers"
   Path:             src/core
   Modules:          CCVector, CCPrint, CCError, CCHeap, CCList, CCOpt, CCPair,
                     CCFun, CCHash, CCInt, CCBool, CCFloat, CCArray, CCRef, CCSet,
-                    CCOrd, CCRandom, CCString, CCHashtbl, CCMap, CCFormat
+                    CCOrd, CCRandom, CCString, CCHashtbl, CCMap, CCFormat,
+                    Containers
   BuildDepends:     bytes
 
 Library "containers_io"
@@ -105,13 +106,6 @@ Library "containers_bigarray"
   FindlibParent:    containers
   BuildDepends:     containers, bigarray, bytes
 
-Library "containers_pervasives"
-  Path:             src/pervasives
-  Modules:          CCPervasives
-  BuildDepends:     containers
-  FindlibName:      pervasives
-  FindlibParent:    containers
-
 Library "containers_misc"
   Path:             src/misc
   Pack:             true
@@ -152,7 +146,7 @@ Document containers
     "-docflags '-colorize-code -short-functors -charset utf-8'"
   XOCamlbuildLibraries:
     containers, containers.misc, containers.iter, containers.data,
-    containers.string, containers.pervasives, containers.bigarray,
+    containers.string, containers.bigarray,
     containers.advanced, containers.io, containers.sexp,
     containers.lwt
 

doc/intro.txt

@@ -44,11 +44,11 @@ CCRef
 CCSet
 CCString
 CCVector
+Containers
 }
 
-{4 Pervasives (aliases to Core Modules)}
+The module {!Containers} contains aliases to most other modules defined
-
+in {i containers core}, and mixins
-Contains aliases to most modules from {i containers core}, and mixins
 such as:
 
 {[ module List = struct
@@ -57,8 +57,6 @@ such as:
   end
 ]}
 
-{!modules: CCPervasives}
-
 {4 Containers.data}
 
 Various data structures.