diff options
| author | Tom Kelly <ctk21@cl.cam.ac.uk> | 2020-04-30 09:40:15 +0100 |
|---|---|---|
| committer | Tom Kelly <ctk21@cl.cam.ac.uk> | 2020-04-30 09:40:15 +0100 |
| commit | d3e043ca1f9c6849a0ef714c3cdd37e4d7892360 (patch) | |
| tree | 442ca626fed2a438de0450ee3ebcd3db162056e1 /middle_end | |
| parent | e4bee10fe76418de670072bddc8ede7ebca57a2f (diff) | |
| parent | f4b30f0a9b93a51317272812c33441326881f9ae (diff) | |
| download | ocaml-d3e043ca1f9c6849a0ef714c3cdd37e4d7892360.tar.gz | |
Merge commit 'f4b30f0a9b93a51317272812c33441326881f9ae' into parallel_minor_gc_4_10
Diffstat (limited to 'middle_end')
| -rw-r--r-- | middle_end/flambda/augment_specialised_args.mli | 2 | ||||
| -rw-r--r-- | middle_end/flambda/base_types/id_types.ml | 2 | ||||
| -rw-r--r-- | middle_end/flambda/base_types/id_types.mli | 6 |
3 files changed, 4 insertions, 6 deletions
diff --git a/middle_end/flambda/augment_specialised_args.mli b/middle_end/flambda/augment_specialised_args.mli index 5c48a12652..910a2d1532 100644 --- a/middle_end/flambda/augment_specialised_args.mli +++ b/middle_end/flambda/augment_specialised_args.mli @@ -48,7 +48,7 @@ module type S = sig -> What_to_specialise.t end -module Make (T : S) : sig +module Make (_ : S) : sig (** [duplicate_function] should be [Inline_and_simplify.duplicate_function]. *) val rewrite_set_of_closures diff --git a/middle_end/flambda/base_types/id_types.ml b/middle_end/flambda/base_types/id_types.ml index 6d2e274311..c9a77adc38 100644 --- a/middle_end/flambda/base_types/id_types.ml +++ b/middle_end/flambda/base_types/id_types.ml @@ -40,7 +40,7 @@ module type UnitId = sig val unit : t -> Compilation_unit.t end -module Id(E:sig end) : Id = struct +module Id() : Id = struct type t = int * string let empty_string = "" let create = let r = ref 0 in diff --git a/middle_end/flambda/base_types/id_types.mli b/middle_end/flambda/base_types/id_types.mli index 48ca037caf..78ca75a8be 100644 --- a/middle_end/flambda/base_types/id_types.mli +++ b/middle_end/flambda/base_types/id_types.mli @@ -46,11 +46,9 @@ sig val unit : t -> Compilation_unit.t end -(** If applied generatively, i.e. [Id(struct end)], creates a new type - of identifiers. *) -module Id : functor (E : sig end) -> Id +module Id () : Id module UnitId : - functor (Id : Id) -> + Id -> functor (Compilation_unit : Identifiable.Thing) -> UnitId with module Compilation_unit := Compilation_unit |