Remove redundant lists and strings indirections

NelsonVides · NelsonVides · commit e8824b4f5b0f · 2024-12-06T14:31:14.000+01:00
diff --git a/big_tests/tests/bosh_SUITE.erl b/big_tests/tests/bosh_SUITE.erl
@@ -691,7 +691,7 @@ reply_in_time(ConfigIn) ->
 server_acks(Config) ->
     escalus:story(Config, [{carol, 1}, {geralt, 1}], fun(Carol, Geralt) ->
         bosh_set_active(Carol, false),
-        ExpectedRid = list_to_binary(integer_to_list(get_bosh_rid(Carol))),
+        ExpectedRid = integer_to_binary(get_bosh_rid(Carol)),
         escalus_client:send(Carol, escalus_stanza:chat_to(Geralt, <<"1st!">>)),
         escalus_client:send(Carol, escalus_stanza:chat_to(Geralt, <<"2nd!">>)),
         timer:sleep(200),
@@ -897,7 +897,7 @@ wait_for_stanza(Client) ->
 
 ack_body(Body, Rid) ->
     Attrs = Body#xmlel.attrs,
-    Ack = {<<"ack">>, list_to_binary(integer_to_list(Rid))},
+    Ack = {<<"ack">>, integer_to_binary(Rid)},
     NewAttrs = lists:keystore(<<"ack">>, 1, Attrs, Ack),
     Body#xmlel{attrs = NewAttrs}.
 
diff --git a/big_tests/tests/common_helper.erl b/big_tests/tests/common_helper.erl
@@ -7,4 +7,4 @@ get_bjid(UserSpec) ->
     <<User/binary,"@",Server/binary>>.
 
 unprep(Bin) when is_binary(Bin) ->
-    list_to_binary(string:titlecase(binary_to_list(Bin))).
+    string:titlecase(Bin).
diff --git a/big_tests/tests/gdpr_SUITE.erl b/big_tests/tests/gdpr_SUITE.erl
@@ -1534,15 +1534,14 @@ retrieve_inbox_for_multiple_messages(Config) ->
 retrieve_logs(Config) ->
     escalus:fresh_story(Config, [{alice, 1}],
         fun(Alice) ->
-            User = string:to_lower(binary_to_list(escalus_client:username(Alice))),
-            Domain = string:to_lower(binary_to_list(escalus_client:server(Alice))),
-            JID = string:to_upper(binary_to_list(escalus_client:short_jid(Alice))),
+            User = string:lowercase(escalus_client:username(Alice)),
+            Domain = string:lowercase(escalus_client:server(Alice)),
+            JID = string:uppercase(binary_to_list(escalus_client:short_jid(Alice))),
             #{node := MIM2NodeName} = MIM2Node = distributed_helper:mim2(),
             mongoose_helper:successful_rpc(net_kernel, connect_node, [MIM2NodeName]),
             mongoose_helper:successful_rpc(MIM2Node, error_logger, error_msg,
                                            ["event=disturbance_in_the_force, jid=~s", [JID]]),
-            Dir = request_and_unzip_personal_data(list_to_binary(User), list_to_binary(Domain),
-                                                  Config),
+            Dir = request_and_unzip_personal_data(User, Domain, Config),
             Filename = filename:join(Dir, "logs-" ++ atom_to_list(MIM2NodeName) ++ ".txt"),
             {ok, Content} = file:read_file(Filename),
             {match, _} = re:run(Content, "disturbance_in_the_force")
diff --git a/big_tests/tests/graphql_muc_SUITE.erl b/big_tests/tests/graphql_muc_SUITE.erl
@@ -1925,7 +1925,7 @@ assert_default_room_config(Response) ->
                    <<"logging">> := false}, get_ok_value(?GET_ROOM_CONFIG_PATH, Response)).
 
 atom_to_enum_item(null) -> null;
-atom_to_enum_item(Atom) -> list_to_binary(string:to_upper(atom_to_list(Atom))).
+atom_to_enum_item(Atom) -> string:uppercase(atom_to_binary(Atom)).
 
 get_room_name() ->
     Domain = domain_helper:domain(),
diff --git a/big_tests/tests/muc_SUITE.erl b/big_tests/tests/muc_SUITE.erl
@@ -4678,7 +4678,7 @@ skip_undefined(Xs) ->
     [X || X <- Xs, X =/= undefined].
 
 i2b(X) when is_integer(X) ->
-    list_to_binary(integer_to_list(X)).
+    integer_to_binary(X).
 
 wait_room_range(Client, FromN, ToN) ->
     wait_room_range(Client, 15, FromN-1, FromN, ToN).
diff --git a/big_tests/tests/muc_light_helper.erl b/big_tests/tests/muc_light_helper.erl
@@ -211,12 +211,12 @@ aff_msg_verify_fun(AffUsersChanges) ->
     end.
 
 -spec lbin(Bin :: binary()) -> binary().
-lbin(Bin) -> list_to_binary(string:to_lower(binary_to_list(Bin))).
-
+lbin(Bin) ->
+    string:lowercase(Bin).
 
 -spec bin_aff_users(AffUsers :: ct_aff_users()) -> [{LBinJID :: binary(), AffBin :: binary()}].
 bin_aff_users(AffUsers) ->
-    [ {lbin(escalus_client:short_jid(User)), list_to_binary(atom_to_list(Aff))}
+    [ {lbin(escalus_client:short_jid(User)), atom_to_binary(Aff)}
       || {User, Aff} <- AffUsers ].
 
 -spec verify_aff_users(Items :: [exml:element()], BinAffUsers :: [{binary(), binary()}]) -> [].
@@ -288,7 +288,7 @@ clear_db(HostType) ->
 
 -spec ver(Int :: integer()) -> binary().
 ver(Int) ->
-  <<"ver-", (list_to_binary(integer_to_list(Int)))/binary>>.
+  <<"ver-", (integer_to_binary(Int))/binary>>.
 
 assert_no_aff_duplicates(AffUsers) ->
     Users = [US || {US, _} <- AffUsers],
@@ -302,8 +302,8 @@ assert_no_aff_duplicates(AffUsers) ->
 
 -spec stanza_blocking_set(BlocklistChanges :: [ct_block_item()]) -> exml:element().
 stanza_blocking_set(BlocklistChanges) ->
-    Items = [#xmlel{ name = list_to_binary(atom_to_list(What)),
-                     attrs = [{<<"action">>, list_to_binary(atom_to_list(Action))}],
+    Items = [#xmlel{ name = atom_to_binary(What),
+                     attrs = [{<<"action">>, atom_to_binary(Action)}],
                      children = [#xmlcdata{ content = Who }] }
              || {What, Action, Who} <- BlocklistChanges],
     escalus_stanza:to(escalus_stanza:iq_set(?NS_MUC_LIGHT_BLOCKING, Items), muc_host()).
diff --git a/big_tests/tests/oauth_SUITE.erl b/big_tests/tests/oauth_SUITE.erl
@@ -435,7 +435,7 @@ serialize(ServerSideToken) ->
     end.
 
 to_lower(B) when is_binary(B) ->
-    list_to_binary(string:to_lower(binary_to_list(B))).
+    string:lowercase(B).
 
 required_modules() ->
     KeyOpts = #{backend => ct_helper:get_internal_database(),
diff --git a/big_tests/tests/offline_SUITE.erl b/big_tests/tests/offline_SUITE.erl
@@ -406,7 +406,7 @@ make_chat_text(I) ->
     <<"Hi, Offline ", Number/binary>>.
 
 make_message_with_expiry(Target, Expiry, Text) ->
-    ExpiryBin = list_to_binary(integer_to_list(Expiry)),
+    ExpiryBin = integer_to_binary(Expiry),
     Stanza = escalus_stanza:chat_to(Target, Text),
     #xmlel{children = Children} = Stanza,
     ExpiryElem = #xmlel{name = <<"x">>,
diff --git a/big_tests/tests/push_SUITE.erl b/big_tests/tests/push_SUITE.erl
@@ -774,7 +774,7 @@ push_notification(PubsubJID, Payload, PublishOpts) ->
 
 bare_jid(JIDOrClient) ->
     ShortJID = escalus_client:short_jid(JIDOrClient),
-    list_to_binary(string:to_lower(binary_to_list(ShortJID))).
+    string:lowercase(ShortJID).
 
 add_pubsub_jid(Config) ->
     CaseName = proplists:get_value(case_name, Config),
diff --git a/big_tests/tests/push_http_SUITE.erl b/big_tests/tests/push_http_SUITE.erl
@@ -161,8 +161,10 @@ process_notification(Req) ->
 
 check_default_format(From, To, Body, Msg) ->
     Attrs = lists:map(fun(P) -> list_to_tuple(binary:split(P, <<$=>>)) end, binary:split(Msg, <<$&>>, [global])),
-    ?assertEqual(to_lower(escalus_client:username(From)), proplists:get_value(<<"author">>, Attrs)),
-    ?assertEqual(to_lower(escalus_client:username(To)), proplists:get_value(<<"receiver">>, Attrs)),
+    ?assertEqual(string:lowercase(escalus_client:username(From)),
+                 proplists:get_value(<<"author">>, Attrs)),
+    ?assertEqual(string:lowercase(escalus_client:username(To)),
+                 proplists:get_value(<<"receiver">>, Attrs)),
     ?assertEqual(Body, proplists:get_value(<<"message">>, Attrs)),
     ?assertEqual(<<"localhost">>, proplists:get_value(<<"server">>, Attrs)),
     ok.
@@ -221,15 +223,6 @@ custom_module_code_2() ->
      "
     .
 
-to_lower(B) ->
-    list_to_binary(
-        string:to_lower(
-            binary_to_list(
-                B
-            )
-        )
-    ).
-
 send(Alice, Bob, Body) ->
     Stanza = escalus_stanza:chat_to(Bob, Body),
     escalus_client:send(Alice, Stanza).
diff --git a/big_tests/tests/push_integration_SUITE.erl b/big_tests/tests/push_integration_SUITE.erl
@@ -983,7 +983,7 @@ gen_token() ->
     integer_to_binary(binary:decode_unsigned(crypto:strong_rand_bytes(16)), 24).
 
 lower(Bin) when is_binary(Bin) ->
-    list_to_binary(string:to_lower(binary_to_list(Bin))).
+    string:lowercase(Bin).
 
 pubsub_node_from_host(Config) ->
     case ?config(pubsub_host, Config) of
diff --git a/big_tests/tests/push_pubsub_SUITE.erl b/big_tests/tests/push_pubsub_SUITE.erl
@@ -396,7 +396,7 @@ rpc(M, F, A) ->
 
 bare_jid(JIDOrClient) ->
     ShortJID = escalus_client:short_jid(JIDOrClient),
-    list_to_binary(string:to_lower(binary_to_list(ShortJID))).
+    string:lowercase(ShortJID).
 
 %% ----------------------------------------------
 %% REST mock handler
diff --git a/rel/files/scripts/bootstrap20-template.escript b/rel/files/scripts/bootstrap20-template.escript
@@ -111,15 +111,5 @@ parse_template_config(TemplateConfigPath, TemplateConfigBin) ->
     end.
 
 % Produce LowerEnvVars depending on the version
--ifdef(OTP_RELEASE).
--if(?OTP_RELEASE >= 24).
 get_env_vars() ->
-    [{string:to_lower(K), V} || {K, V} <- os:env()].
--else.
-get_env_vars() ->
-    [{string:to_lower(K), V} || {K, V} <- os:list_env_vars()].
--endif.
--else.
-get_env_vars() ->
-    [{string:to_lower(K), V} || {K, V} <- os:list_env_vars()].
--endif.
+    [{string:lowercase(K), V} || {K, V} <- os:env()].
diff --git a/src/adhoc.erl b/src/adhoc.erl
@@ -112,7 +112,7 @@ produce_response(#adhoc_response{lang = _Lang,
            attrs = [{<<"xmlns">>, ?NS_COMMANDS},
                     {<<"sessionid">>, SessionID},
                     {<<"node">>, Node},
-                    {<<"status">>, list_to_binary(atom_to_list(Status))}],
+                    {<<"status">>, atom_to_binary(Status)}],
            children = ActionsEls ++ NotesEls ++ Elements}.
 
 -spec ensure_correct_session_id(binary()) -> binary().
diff --git a/src/eldap_utils.erl b/src/eldap_utils.erl
@@ -199,14 +199,10 @@ match_filter_name(_, _) ->
   [].
 
 -spec case_insensitive_match(binary(), binary()) -> boolean().
-case_insensitive_match(X, Y) ->
-    X1 = string:to_lower(maybe_b2list(X)),
-    Y1 = string:to_lower(maybe_b2list(Y)),
-  case X1 == Y1 of
-    true -> true;
-    _-> false
-  end.
-
+case_insensitive_match(X, Y) when is_binary(X), is_binary(Y) ->
+    X1 = string:casefold(X),
+    Y1 = string:casefold(Y),
+    X1 =:= Y1.
 
 -spec get_state(mongooseim:host_type(), atom()) -> any().
 get_state(HostType, Module) ->
diff --git a/src/graphql/mongoose_graphql_enum.erl b/src/graphql/mongoose_graphql_enum.erl
@@ -5,9 +5,9 @@
 -ignore_xref([input/2, output/2]).
 
 input(<<"PresenceShow">>, Show) ->
-    {ok, list_to_binary(string:to_lower(binary_to_list(Show)))};
+    {ok, string:lowercase(Show)};
 input(<<"PresenceType">>, Type) ->
-    {ok, list_to_binary(string:to_lower(binary_to_list(Type)))};
+    {ok, string:lowercase(Type)};
 input(<<"Affiliation">>, <<"OWNER">>) -> {ok, owner};
 input(<<"Affiliation">>, <<"MEMBER">>) -> {ok, member};
 input(<<"Affiliation">>, <<"NONE">>) -> {ok, none};
@@ -33,45 +33,45 @@ input(<<"MUCAffiliation">>, <<"ADMIN">>) -> {ok, admin};
 input(<<"MUCAffiliation">>, <<"OWNER">>) -> {ok, owner};
 input(<<"PrivacyClassificationTags">>, Name) -> {ok, Name};
 input(<<"TelephoneTags">>, Name) -> {ok, Name};
-input(<<"LogLevel">>, Name) -> {ok, list_to_atom(string:to_lower(binary_to_list(Name)))};
+input(<<"LogLevel">>, Name) -> {ok, binary_to_atom(string:lowercase(Name))};
 input(<<"MetricType">>, Name) -> {ok, Name}.
 
 output(<<"DomainStatus">>, Type) ->
-    {ok, list_to_binary(string:to_upper(atom_to_list(Type)))};
+    {ok, string:uppercase(atom_to_binary(Type))};
 output(<<"PresenceShow">>, Show) ->
-    {ok, list_to_binary(string:to_upper(binary_to_list(Show)))};
+    {ok, string:uppercase(Show)};
 output(<<"PresenceType">>, Type) ->
-    {ok, list_to_binary(string:to_upper(binary_to_list(Type)))};
+    {ok, string:uppercase(Type)};
 output(<<"AuthStatus">>, Status) ->
     {ok, atom_to_binary(Status, utf8)};
 output(<<"AuthType">>, Type) ->
-    {ok, list_to_binary(string:to_upper(atom_to_list(Type)))};
+    {ok, string:uppercase(atom_to_binary(Type))};
 output(<<"Affiliation">>, Aff) ->
-    {ok, list_to_binary(string:to_upper(atom_to_list(Aff)))};
+    {ok, string:uppercase(atom_to_binary(Aff))};
 output(<<"BlockingAction">>, Action) ->
-    {ok, list_to_binary(string:to_upper(atom_to_list(Action)))};
+    {ok, string:uppercase(atom_to_binary(Action))};
 output(<<"BlockedEntityType">>, What) ->
-    {ok, list_to_binary(string:to_upper(atom_to_list(What)))};
+    {ok, string:uppercase(atom_to_binary(What))};
 output(<<"ContactSub">>, Type) when Type =:= both;
                                     Type =:= from;
                                     Type =:= to;
                                     Type =:= none ->
-    {ok, list_to_binary(string:to_upper(atom_to_list(Type)))};
+    {ok, string:uppercase(atom_to_binary(Type))};
 output(<<"ContactAsk">>, Type) when Type =:= subscrube;
                                     Type =:= unsubscribe;
                                     Type =:= in;
                                     Type =:= out;
                                     Type =:= both;
                                     Type =:= none ->
-    {ok, list_to_binary(string:to_upper(atom_to_list(Type)))};
+    {ok, string:uppercase(atom_to_binary(Type))};
 output(<<"MUCRole">>, Role) ->
-    {ok, list_to_binary(string:to_upper(atom_to_list(Role)))};
+    {ok, string:uppercase(atom_to_binary(Role))};
 output(<<"MUCAffiliation">>, Aff) ->
-    {ok, list_to_binary(string:to_upper(atom_to_list(Aff)))};
+    {ok, string:uppercase(atom_to_binary(Aff))};
 output(<<"AddressTags">>, Name) -> {ok, Name};
 output(<<"EmailTags">>, Name) -> {ok, Name};
 output(<<"PrivacyClassificationTags">>, Name) -> {ok, Name};
-output(<<"LogLevel">>, Name) -> {ok, list_to_binary(string:to_upper(atom_to_list(Name)))};
+output(<<"LogLevel">>, Name) -> {ok, string:uppercase(atom_to_binary(Name))};
 output(<<"TelephoneTags">>, Name) -> {ok, Name};
 output(<<"MetricType">>, Type) -> {ok, Type};
 output(<<"StatusCode">>, Code) -> {ok, Code}.
diff --git a/src/jlib.erl b/src/jlib.erl
@@ -391,7 +391,8 @@ rsm_encode_count(Count, Arr) ->
     [#xmlel{name = <<"count">>, children = [#xmlcdata{content = i2b(Count)}]} | Arr].
 
 -spec i2b(integer()) -> binary().
-i2b(I) when is_integer(I) -> list_to_binary(integer_to_list(I)).
+i2b(I) when is_integer(I) ->
+    integer_to_binary(I).
 
 -spec timestamp_to_xml(TimestampString :: rfc3339_string(),
                        FromJID :: jid:simple_jid() | jid:jid() | undefined,
diff --git a/src/mam/mod_mam_utils.erl b/src/mam/mod_mam_utils.erl
@@ -826,7 +826,7 @@ normalize_search_text(undefined, _WordSeparator) ->
     undefined;
 normalize_search_text(Text, WordSeparator) ->
     BodyString = unicode:characters_to_list(Text),
-    LowerBody = string:to_lower(BodyString),
+    LowerBody = string:lowercase(BodyString),
     ReOpts = [{return, list}, global, unicode, ucp],
     Re0 = re:replace(LowerBody, "[, .:;-?!]+", " ", ReOpts),
     Re1 = re:replace(Re0, "([^\\w ]+)|(^\\s+)|(\\s+$)", "", ReOpts),
diff --git a/src/muc/mod_muc_room.erl b/src/muc/mod_muc_room.erl
@@ -3847,7 +3847,7 @@ get_roomdesc_tail(StateData, Lang) ->
                    translate:translate(Lang, <<"private, ">>)
            end,
     Count = count_users(StateData),
-    CountBin = list_to_binary(integer_to_list(Count)),
+    CountBin = integer_to_binary(Count),
     <<" (", Desc/binary, CountBin/binary, ")">>.
 
 
diff --git a/src/translate.erl b/src/translate.erl
@@ -87,7 +87,7 @@ load_translation_files(Dir, MsgFiles) ->
 
 -spec lang_from_file_name(file:filename()) -> string().
 lang_from_file_name(Filename) ->
-    string:to_lower(filename:rootname(Filename)).
+    string:lowercase(filename:rootname(Filename)).
 
 -spec has_msg_extension(file:filename()) -> boolean().
 has_msg_extension(FileName) ->
@@ -150,5 +150,5 @@ short_lang(LLang) ->
     end.
 
 -spec to_lower(binary()) -> binary().
-to_lower(Bin) ->
-    list_to_binary(string:to_lower(binary_to_list(Bin))).
+to_lower(Bin) when is_binary(Bin) ->
+    string:lowercase(Bin).
diff --git a/src/vcard/mod_vcard_api.erl b/src/vcard/mod_vcard_api.erl
@@ -127,7 +127,7 @@ from_map_to_xml(<<"credential">>) -> <<"CRED">>;
 from_map_to_xml(<<"country">>) -> <<"CTRY">>;
 from_map_to_xml(<<"binValue">>) -> <<"BINVAL">>;
 from_map_to_xml(<<"extValue">>) -> <<"EXTVAL">>;
-from_map_to_xml(Name) -> list_to_binary(string:to_upper(binary_to_list(Name))).
+from_map_to_xml(Name) -> string:uppercase(Name).
 
 to_map_format(Vcard) ->
     lists:foldl(fun(#xmlel{name = Name, children = Value}, Acc) ->
diff --git a/test/mim_ct_rest_handler.erl b/test/mim_ct_rest_handler.erl
@@ -47,7 +47,7 @@ handle(Req, {_, _, _, _, true, _} = State) ->
     reply(Req, State, 404, "");
 handle(Req, {<<"GET">>, <<"/auth/", _/binary>>, <<"check_password">>, {U, S, P}, _, _} = State) ->
     Result = mim_ct_rest:check_password(U, S, P),
-    reply(Req, State, 200, list_to_binary(atom_to_list(Result)));
+    reply(Req, State, 200, atom_to_binary(Result));
 handle(Req, {<<"GET">>, <<"/auth/", _/binary>>, <<"get_password">>, {U, S, _P}, _, _} = State) ->
     {RetCode,Password} = get_password_or_certs(U, S),
     reply(Req, State, RetCode, Password);
@@ -56,7 +56,7 @@ handle(Req, {<<"GET">>, <<"/auth/", _/binary>>, <<"get_certs">>, {U, S, _P}, _,
     reply(Req, State, RetCode, PemCerts);
 handle(Req, {<<"GET">>, <<"/auth/", _/binary>>, <<"user_exists">>, {U, S, _P}, _, _} = State) ->
     Result = mim_ct_rest:user_exists(U, S),
-    reply(Req, State, 200, list_to_binary(atom_to_list(Result)));
+    reply(Req, State, 200, atom_to_binary(Result));
 handle(Req, {<<"POST">>, <<"/auth/", _/binary>>, <<"set_password">>, {U, S, P}, _, _} = State) ->
     ok = mim_ct_rest:set_password(U, S, P),
     reply(Req, State, 204, <<>>);
