clean up modality printing

Author: riaqn

testsuite/tests/typing-jkind-bounds/subsumption/modalities.ml

@@ -370,17 +370,17 @@ end
 Line 4, characters 40-48:
 4 |   type 'a t : immutable_data with 'a @@ portable contended portable
                                             ^^^^^^^^
-Warning 213: This portability is overriden by meet_with(portable) later.
+Warning 213: This portability is overriden by portable later.
 
 Line 4, characters 40-48:
 4 |   type 'a t : immutable_data with 'a @@ portable contended portable
                                             ^^^^^^^^
-Warning 213: This portability is overriden by meet_with(portable) later.
+Warning 213: This portability is overriden by portable later.
 
 Line 4, characters 40-48:
 4 |   type 'a t : immutable_data with 'a @@ portable contended portable
                                             ^^^^^^^^
-Warning 213: This portability is overriden by meet_with(portable) later.
+Warning 213: This portability is overriden by portable later.
 
 module M : sig type 'a t : immutable_data with 'a @@ portable end
 |}]

testsuite/tests/typing-modes/modes.ml

@@ -325,7 +325,7 @@ type t = Foo of global_ string @@ global
 Line 1, characters 16-23:
 1 | type t = Foo of global_ string @@ global
                     ^^^^^^^
-Warning 213: This locality is overriden by meet_with(global) later.
+Warning 213: This locality is overriden by global later.
 
 type t = Foo of global_ string
 |}]
@@ -354,7 +354,7 @@ type r = {
 Line 2, characters 2-9:
 2 |   global_ x : string @@ global
       ^^^^^^^
-Warning 213: This locality is overriden by meet_with(global) later.
+Warning 213: This locality is overriden by global later.
 
 type r = { global_ x : string; }
 |}]
@@ -381,7 +381,7 @@ type r = {
 Line 2, characters 16-23:
 2 |   x : string @@ aliased global many aliased
                     ^^^^^^^
-Warning 213: This uniqueness is overriden by join_with(aliased) later.
+Warning 213: This uniqueness is overriden by aliased later.
 
 type r = { x : string @@ global many aliased; }
 |}]

testsuite/tests/typing-modes/val_modalities.ml

@@ -45,27 +45,27 @@ end
 Line 2, characters 22-28:
 2 |     val x : string @@ global local unique aliased once many uncontended contended
                           ^^^^^^
-Warning 213: This locality is overriden by meet_with(local) later.
+Warning 213: This locality is overriden by local later.
 
 Line 2, characters 50-54:
 2 |     val x : string @@ global local unique aliased once many uncontended contended
                                                       ^^^^
-Warning 213: This linearity is overriden by meet_with(many) later.
+Warning 213: This linearity is overriden by many later.
 
 Line 3, characters 6-14:
 3 |       portable nonportable
           ^^^^^^^^
-Warning 213: This portability is overriden by meet_with(nonportable) later.
+Warning 213: This portability is overriden by nonportable later.
 
 Line 2, characters 35-41:
 2 |     val x : string @@ global local unique aliased once many uncontended contended
                                        ^^^^^^
-Warning 213: This uniqueness is overriden by join_with(aliased) later.
+Warning 213: This uniqueness is overriden by aliased later.
 
 Line 2, characters 60-71:
 2 |     val x : string @@ global local unique aliased once many uncontended contended
                                                                 ^^^^^^^^^^^
-Warning 213: This contention is overriden by join_with(contended) later.
+Warning 213: This contention is overriden by contended later.
 
 module type S = sig val x : string @@ many aliased contended end
 |}]

typing/typemode.ml

@@ -559,7 +559,7 @@ let sort_dedup_modalities ~warn l =
     if warn
     then
       let axis = Format.asprintf "%a" Value.Axis.print ax0 in
-      let overriden_by = Format.asprintf "%a" Modality.print a1 in
+      let { txt = Modality overriden_by; _ } = untransl_modality a1 in
       Location.prerr_warning loc0
         (Warnings.Modal_axis_specified_twice { axis; overriden_by })
   in
@@ -574,7 +574,6 @@ let transl_modalities ~maturity mut attrs modalities =
   (* - mut_modalities is applied before explicit modalities.
      - explicit modalities can override mut_modalities.
      - For the same axis, later modalities overrides earlier modalities. *)
-  (* CR zqian: warn if an axis is specified multiple times in a modality expr. *)
   List.fold_left
     (fun m (Atom (ax, a) as t) ->
       let m = Value.Const.set ax a m in