From 08cb2781dd3ace11e25e87105ba57b80dab3a52d Mon Sep 17 00:00:00 2001
From: Hans Bolinder <hasse@erlang.org>
Date: Wed, 26 Apr 2017 15:23:06 +0200
Subject: edoc: Revert fixes for string:length/1

Reverts commits cef44e1 and 548f4e3.
---
 lib/edoc/src/edoc_layout.erl | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

(limited to 'lib/edoc/src/edoc_layout.erl')

diff --git a/lib/edoc/src/edoc_layout.erl b/lib/edoc/src/edoc_layout.erl
index 5b1889ab06..eafab0588e 100644
--- a/lib/edoc/src/edoc_layout.erl
+++ b/lib/edoc/src/edoc_layout.erl
@@ -544,7 +544,7 @@ t_clause(Name, Type, Opts) ->
 
 pp_clause(Pre, Type, Opts) ->
     Types = ot_utype([Type]),
-    Atom = lists:duplicate(string_length(Pre), $a),
+    Atom = lists:duplicate(string:length(Pre), $a),
     Attr = {attribute,0,spec,{{list_to_atom(Atom),0},[Types]}},
     L1 = erl_pp:attribute(erl_parse:new_anno(Attr),
                           [{encoding, Opts#opts.encoding}]),
@@ -566,7 +566,7 @@ format_type(Prefix, _Name, Type, Last, Opts) ->
     [{tt, Prefix ++ [" = "] ++ t_utype(Type, Opts) ++ Last}].
 
 pp_type(Prefix, Type, Opts) ->
-    Atom = list_to_atom(lists:duplicate(string_length(Prefix), $a)),
+    Atom = list_to_atom(lists:duplicate(string:length(Prefix), $a)),
     Attr = {attribute,0,type,{Atom,ot_utype(Type),[]}},
     L1 = erl_pp:attribute(erl_parse:new_anno(Attr),
                           [{encoding, Opts#opts.encoding}]),
@@ -768,21 +768,6 @@ atom(String, #opts{encoding = latin1}) ->
 atom(String, #opts{encoding = utf8}) ->
     io_lib:write_atom(list_to_atom(String)).
 
--dialyzer({nowarn_function, string_length/1}).
-string_length(Data) ->
-    try iolist_size(Data)
-    catch
-        _:_ ->
-            M = string,
-            F = length,
-            As = [Data],
-            try apply(M, F, As)
-            catch
-                _:_ ->
-                    20
-            end
-    end.
-
 %% <!ATTLIST author
 %%   name CDATA #REQUIRED
 %%   email CDATA #IMPLIED
-- 
cgit v1.2.3