[sledge] Simplify using shadowing of modules from includes

Summary:
OCaml 4.08 supports shadowing modules from includes, which enables
some simplification.

Reviewed By: ngorogiannis

Differential Revision: D18736379

fbshipit-source-id: 646e2c07c

sledge/src/import/import.ml

@@ -12,16 +12,8 @@ include (
     sig
       include
         (module type of Base
-          (* extended below, remove *)
-          with module Array := Base.Array
-           and module Invariant := Base.Invariant
-           and module List := Base.List
-           and module Map := Base.Map
-           and module Option := Base.Option
-           and module Result := Base.Result
-           and module Set := Base.Set
           (* prematurely deprecated, remove and use Stdlib instead *)
-           and module Filename := Base.Filename
+          with module Filename := Base.Filename
            and module Format := Base.Format
            and module Marshal := Base.Marshal
            and module Scanf := Base.Scanf

sledge/src/import/import.mli

@@ -12,16 +12,8 @@ include module type of (
     sig
       include
         (module type of Base
-          (* extended below, remove *)
-          with module Array := Base.Array
-           and module Invariant := Base.Invariant
-           and module List := Base.List
-           and module Map := Base.Map
-           and module Option := Base.Option
-           and module Result := Base.Result
-           and module Set := Base.Set
           (* prematurely deprecated, remove and use Stdlib instead *)
-           and module Filename := Base.Filename
+          with module Filename := Base.Filename
            and module Format := Base.Format
            and module Marshal := Base.Marshal
            and module Scanf := Base.Scanf