From b22d8b4151cf537ff1870d319d0c07883174ad91 Mon Sep 17 00:00:00 2001 From: Josh Berdine Date: Thu, 28 Nov 2019 12:41:26 -0800 Subject: [PATCH] [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 | 10 +--------- sledge/src/import/import.mli | 10 +--------- 2 files changed, 2 insertions(+), 18 deletions(-) diff --git a/sledge/src/import/import.ml b/sledge/src/import/import.ml index c7d240822..ee33ee883 100644 --- a/sledge/src/import/import.ml +++ b/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 diff --git a/sledge/src/import/import.mli b/sledge/src/import/import.mli index a93c6ae91..5ea7f24fd 100644 --- a/sledge/src/import/import.mli +++ b/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