@@ -87,7 +87,7 @@ module Aliases_of_canonical_element : sig
87
87
88
88
val move_variables_to_mode_in_types : t -> t
89
89
90
- val compose : t -> newer :Coercion .t -> t
90
+ val compose : t -> then_ :Coercion .t -> t
91
91
end = struct
92
92
type t = {
93
93
aliases : map_to_canonical Name_mode.Map .t ;
@@ -225,16 +225,12 @@ end = struct
225
225
invariant t; (* CR xclerc for xclerc: not guaranteed to hold *)
226
226
t
227
227
228
- let compose { aliases; all; } ~newer =
228
+ let compose { aliases; all; } ~then_ =
229
229
let f m =
230
230
Simple.Map. map
231
231
(fun { coercion_to_canonical; } ->
232
- (* CR lmaurer: This seems like the wrong way around to me, but
233
- possibly only because I'm confused. At least, this function and/or
234
- its argument should have a more descriptive name to make it
235
- clearer what's going on - [newer] is not descriptive! *)
236
232
{ coercion_to_canonical =
237
- Coercion. compose_exn coercion_to_canonical ~then_: newer ; })
233
+ Coercion. compose_exn coercion_to_canonical ~then_ ; })
238
234
m
239
235
in
240
236
let aliases = Name_mode.Map. map f aliases in
@@ -482,7 +478,7 @@ let add_alias_between_canonical_elements t ~canonical_element ~coercion_to_canon
482
478
let aliases =
483
479
Aliases_of_canonical_element. add
484
480
(Aliases_of_canonical_element. union
485
- (Aliases_of_canonical_element. compose aliases_of_to_be_demoted ~newer : coercion_to_canonical)
481
+ (Aliases_of_canonical_element. compose aliases_of_to_be_demoted ~then_ : coercion_to_canonical)
486
482
aliases_of_canonical_element)
487
483
to_be_demoted
488
484
~coercion_to_canonical
0 commit comments