Merge branch 'jan/fix/alias' into 'master'

[alias] correctly expose the graph's edge label type

See merge request frama-c/frama-c!4517

src/plugins/alias/src/API.mli

@@ -37,7 +37,7 @@ module EdgeLabel : sig
   val pretty : Format.formatter -> t -> unit
 end
 
-module G : Graph.Sig.G with type V.t = int and type E.t = int * EdgeLabel.t * int
+module G : Graph.Sig.G with type V.t = int and type E.label = EdgeLabel.t
 
 type v = G.V.t
 

src/plugins/alias/src/abstract_state.mli

@@ -36,7 +36,7 @@ module EdgeLabel : sig
   val pretty : Format.formatter -> t -> unit
 end
 
-module G: Graph.Sig.G with type V.t = int and type E.t = int * EdgeLabel.t * int
+module G: Graph.Sig.G with type V.t = int and type E.label = EdgeLabel.t
 
 module LSet = Cil_datatype.LvalStructEq.Set
 module VarSet = Cil_datatype.Varinfo.Set