From 0b5dbb28332012c22b915364b55ce31843a26bdf Mon Sep 17 00:00:00 2001
From: Anders Svensson <anders@erlang.org>
Date: Thu, 16 May 2013 18:40:13 +0200
Subject: Remove redundant integer type specifiers from binaries

---
 lib/diameter/src/compiler/diameter_codegen.erl |  6 +++---
 lib/diameter/test/diameter_codec_test.erl      | 10 +++++-----
 lib/diameter/test/diameter_traffic_SUITE.erl   | 19 +++++++------------
 3 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/lib/diameter/src/compiler/diameter_codegen.erl b/lib/diameter/src/compiler/diameter_codegen.erl
index 80036879ea..e687145263 100644
--- a/lib/diameter/src/compiler/diameter_codegen.erl
+++ b/lib/diameter/src/compiler/diameter_codegen.erl
@@ -574,12 +574,12 @@ cs_enumerated_avp({AvpName, Values}) ->
     lists:flatmap(fun(V) -> c_enumerated_avp(AvpName, V) end, Values).
 
 c_enumerated_avp(AvpName, {_,I}) ->
-    [{?clause, [?ATOM(decode), ?Atom(AvpName), ?TERM(<<I:32/integer>>)],
+    [{?clause, [?ATOM(decode), ?Atom(AvpName), ?TERM(<<I:32>>)],
       [],
       [?TERM(I)]},
      {?clause, [?ATOM(encode), ?Atom(AvpName), ?INTEGER(I)],
       [],
-      [?TERM(<<I:32/integer>>)]}].
+      [?TERM(<<I:32>>)]}].
 
 %%% ------------------------------------------------------------------------
 %%% msg_header/1
@@ -700,7 +700,7 @@ c_empty_value({Name, _, _, _}) ->
 c_empty_value({Name, _}) ->
     {?clause, [?Atom(Name)],
      [],
-     [?TERM(<<0:32/integer>>)]}.
+     [?TERM(<<0:32>>)]}.
 
 %%% ------------------------------------------------------------------------
 %%% # dict/0
diff --git a/lib/diameter/test/diameter_codec_test.erl b/lib/diameter/test/diameter_codec_test.erl
index 0baac59c1a..24d4c7665e 100644
--- a/lib/diameter/test/diameter_codec_test.erl
+++ b/lib/diameter/test/diameter_codec_test.erl
@@ -265,7 +265,7 @@ arity(M, Name, AvpName, Rec) ->
 %% enum/3
 
 enum(M, Name, {_,E}) ->
-    B = <<E:32/integer>>,
+    B = <<E:32>>,
     B = M:avp(encode, E, Name),
     E = M:avp(decode, B, Name).
 
@@ -322,15 +322,15 @@ values('Unsigned64') ->
 values('Float32') ->
     E = (1 bsl  8) - 2,
     F = (1 bsl 23) - 1,
-    <<Mx:32/float>> = <<0:1/integer, E:8/integer, F:23/integer>>,
-    <<Mn:32/float>> = <<1:1/integer, E:8/integer, F:23/integer>>,
+    <<Mx:32/float>> = <<0:1, E:8, F:23>>,
+    <<Mn:32/float>> = <<1:1, E:8, F:23>>,
     {[0.0, infinity, '-infinity', Mx, Mn], [0]};
 
 values('Float64') ->
     E = (1 bsl 11) - 2,
     F = (1 bsl 52) - 1,
-    <<Mx:64/float>> = <<0:1/integer, E:11/integer, F:52/integer>>,
-    <<Mn:64/float>> = <<1:1/integer, E:11/integer, F:52/integer>>,
+    <<Mx:64/float>> = <<0:1, E:11, F:52>>,
+    <<Mn:64/float>> = <<1:1, E:11, F:52>>,
     {[0.0, infinity, '-infinity', Mx, Mn], [0]};
 
 values('Address') ->
diff --git a/lib/diameter/test/diameter_traffic_SUITE.erl b/lib/diameter/test/diameter_traffic_SUITE.erl
index 42cb4b6844..21a9625fa1 100644
--- a/lib/diameter/test/diameter_traffic_SUITE.erl
+++ b/lib/diameter/test/diameter_traffic_SUITE.erl
@@ -847,7 +847,7 @@ prepare(Pkt, Caps, N, #group{client_dict0 = Dict0} = Group)
         = diameter_codec:encode(Dict0, Pkt#diameter_packet{msg = Req}),
     Offset = L - 24,  %% to Auth-Application-Id
     <<H:Offset/binary,
-      Hdr:5/binary, 12:24/integer, Data:4/binary,
+      Hdr:5/binary, 12:24, Data:4/binary,
       T:12/binary>>
         = B,
     AL = case N of
@@ -857,7 +857,7 @@ prepare(Pkt, Caps, N, #group{client_dict0 = Dict0} = Group)
          end,
     E#diameter_packet{bin = <<H/binary,
                               T/binary,
-                              Hdr/binary, AL:24/integer, Data/binary>>};
+                              Hdr/binary, AL:24, Data/binary>>};
 
 prepare(Pkt, Caps, N, #group{client_dict0 = Dict0} = Group)
   when N == send_invalid_avp_length;
@@ -870,14 +870,9 @@ prepare(Pkt, Caps, N, #group{client_dict0 = Dict0} = Group)
         = E
         = diameter_codec:encode(Dict0, Pkt#diameter_packet{msg = Req}),
     Offset = L - 7 - 12,  %% to AVP Length
-    <<H0:Offset/binary, 12:24/integer, T:16/binary>> = B0,
-    <<V, L:24/integer, H/binary>> = H0,  %% assert
-    E#diameter_packet{bin = <<V,
-                              (L+4):24/integer,
-                              H/binary,
-                              16:24/integer,
-                              0:32/integer,
-                              T/binary>>};
+    <<H0:Offset/binary, 12:24, T:16/binary>> = B0,
+    <<V, L:24, H/binary>> = H0,  %% assert
+    E#diameter_packet{bin = <<V, (L+4):24, H/binary, 16:24, 0:32, T/binary>>};
 
 prepare(Pkt, Caps, send_unrecognized_mandatory, #group{client_dict0 = Dict0}
                                                 = Group) ->
@@ -894,7 +889,7 @@ prepare(Pkt, Caps, send_unsupported, #group{client_dict0 = Dict0} = Group) ->
     #diameter_packet{bin = <<H:5/binary, _CmdCode:3/binary, T/binary>>}
         = E
         = diameter_codec:encode(Dict0, Pkt#diameter_packet{msg = Req}),
-    E#diameter_packet{bin = <<H/binary, 42:24/integer, T/binary>>};
+    E#diameter_packet{bin = <<H/binary, 42:24, T/binary>>};
 
 prepare(Pkt, Caps, send_unsupported_app, #group{client_dict0 = Dict0}
                                          = Group) ->
@@ -902,7 +897,7 @@ prepare(Pkt, Caps, send_unsupported_app, #group{client_dict0 = Dict0}
     #diameter_packet{bin = <<H:8/binary, _ApplId:4/binary, T/binary>>}
         = E
         = diameter_codec:encode(Dict0, Pkt#diameter_packet{msg = Req}),
-    E#diameter_packet{bin = <<H/binary, ?BAD_APP:32/integer, T/binary>>};
+    E#diameter_packet{bin = <<H/binary, ?BAD_APP:32, T/binary>>};
 
 prepare(Pkt, Caps, send_error_bit, Group) ->
     #diameter_packet{header = Hdr} = Pkt,
-- 
cgit v1.2.3