@@ -85,7 +85,7 @@ module Aliases_of_canonical_element : sig
85
85
86
86
val merge : t -> t -> t
87
87
88
- val compose : t -> newer :Coercion .t -> t
88
+ val compose : t -> then_ :Coercion .t -> t
89
89
end = struct
90
90
type t = {
91
91
aliases : map_to_canonical Name_mode.Map .t ;
@@ -223,16 +223,12 @@ end = struct
223
223
invariant t; (* CR xclerc for xclerc: not guaranteed to hold *)
224
224
t
225
225
226
- let compose { aliases; all; } ~newer =
226
+ let compose { aliases; all; } ~then_ =
227
227
let f m =
228
228
Simple.Map. map
229
229
(fun { coercion_to_canonical; } ->
230
- (* CR lmaurer: This seems like the wrong way around to me, but
231
- possibly only because I'm confused. At least, this function and/or
232
- its argument should have a more descriptive name to make it
233
- clearer what's going on - [newer] is not descriptive! *)
234
230
{ coercion_to_canonical =
235
- Coercion. compose_exn coercion_to_canonical ~then_: newer ; })
231
+ Coercion. compose_exn coercion_to_canonical ~then_ ; })
236
232
m
237
233
in
238
234
let aliases = Name_mode.Map. map f aliases in
@@ -456,7 +452,7 @@ let add_alias_between_canonical_elements t ~canonical_element ~coercion_to_canon
456
452
let aliases =
457
453
Aliases_of_canonical_element. add
458
454
(Aliases_of_canonical_element. union
459
- (Aliases_of_canonical_element. compose aliases_of_to_be_demoted ~newer : coercion_to_canonical)
455
+ (Aliases_of_canonical_element. compose aliases_of_to_be_demoted ~then_ : coercion_to_canonical)
460
456
aliases_of_canonical_element)
461
457
to_be_demoted
462
458
~coercion_to_canonical
0 commit comments