From e7a3bf9c385ac6df2209c6f7c92543a3dd7f6497 Mon Sep 17 00:00:00 2001
From: Richard Carlsson <richardc@klarna.com>
Date: Tue, 17 Apr 2018 13:28:24 +0200
Subject: Move lib:nonl/1 into yecc.erl

---
 lib/dialyzer/test/options1_SUITE_data/src/compiler/compile.erl |  6 +++++-
 lib/kernel/test/os_SUITE.erl                                   |  2 +-
 lib/parsetools/src/yecc.erl                                    |  8 ++++++--
 lib/stdlib/doc/src/lib.xml                                     |  9 ---------
 lib/stdlib/src/lib.erl                                         | 10 +---------
 lib/tools/test/eprof_SUITE_data/eed.erl                        |  6 +++++-
 6 files changed, 18 insertions(+), 23 deletions(-)

(limited to 'lib')

diff --git a/lib/dialyzer/test/options1_SUITE_data/src/compiler/compile.erl b/lib/dialyzer/test/options1_SUITE_data/src/compiler/compile.erl
index 7e5ccde2fd..4e4eb63509 100644
--- a/lib/dialyzer/test/options1_SUITE_data/src/compiler/compile.erl
+++ b/lib/dialyzer/test/options1_SUITE_data/src/compiler/compile.erl
@@ -228,11 +228,15 @@ os_process_size() ->
     case os:type() of
 	{unix, sunos} ->
 	    Size = os:cmd("ps -o vsz -p " ++ os:getpid() ++ " | tail -1"),
-	    list_to_integer(lib:nonl(Size));
+	    list_to_integer(nonl(Size));
 	_ ->
 	    0
     end.
 
+nonl([10]) -> [];
+nonl([]) -> [];
+nonl([H|T]) -> [H|nonl(T)].
+
 run_tc({Name,Fun}, St) ->
     Before0 = statistics(runtime),
     Val = (catch Fun(St)),
diff --git a/lib/kernel/test/os_SUITE.erl b/lib/kernel/test/os_SUITE.erl
index 591fbb2125..a9e1ae6aa2 100644
--- a/lib/kernel/test/os_SUITE.erl
+++ b/lib/kernel/test/os_SUITE.erl
@@ -388,7 +388,7 @@ comp(Expected, Got) ->
 	    ct:fail(failed)
     end.
 
-%% Like lib:nonl/1, but strips \r as well as \n.
+%% strips \n and \r\n from end of string
 
 strip_nl([$\r, $\n]) -> [];
 strip_nl([$\n])      -> [];
diff --git a/lib/parsetools/src/yecc.erl b/lib/parsetools/src/yecc.erl
index b4e1cfe5e3..fbffd228ea 100644
--- a/lib/parsetools/src/yecc.erl
+++ b/lib/parsetools/src/yecc.erl
@@ -455,10 +455,14 @@ os_process_size() ->
     case os:type() of
         {unix, sunos} ->
             Size = os:cmd("ps -o vsz -p " ++ os:getpid() ++ " | tail -1"),
-            list_to_integer(lib:nonl(Size));
+            list_to_integer(nonl(Size));
         _ ->
             0
-    end.            
+    end.
+
+nonl([10]) -> [];
+nonl([]) -> [];
+nonl([H|T]) -> [H|nonl(T)].
 
 timeit(Name, Fun, St0) ->
     Time = runtime,
diff --git a/lib/stdlib/doc/src/lib.xml b/lib/stdlib/doc/src/lib.xml
index 58dad7c9e0..7aabb4bea8 100644
--- a/lib/stdlib/doc/src/lib.xml
+++ b/lib/stdlib/doc/src/lib.xml
@@ -56,15 +56,6 @@
       </desc>
     </func>
 
-    <func>
-      <name name="nonl" arity="1"/>
-      <fsummary>Remove last newline.</fsummary>
-      <desc>
-        <p>Removes the last newline character, if any, in
-          <c><anno>String1</anno></c>.</p>
-      </desc>
-    </func>
-
     <func>
       <name name="progname" arity="0"/>
       <fsummary>Return name of Erlang start script.</fsummary>
diff --git a/lib/stdlib/src/lib.erl b/lib/stdlib/src/lib.erl
index 51e0c3f77e..72ca7dab0a 100644
--- a/lib/stdlib/src/lib.erl
+++ b/lib/stdlib/src/lib.erl
@@ -19,7 +19,7 @@
 %%
 -module(lib).
 
--export([flush_receive/0, error_message/2, progname/0, nonl/1, send/2,
+-export([flush_receive/0, error_message/2, progname/0, send/2,
 	 sendw/2, eval_str/1]).
 
 -export([extended_parse_exprs/1, extended_parse_term/1,
@@ -62,14 +62,6 @@ progname() ->
 	    no_prog_name
     end.
 
--spec nonl(String1) -> String2 when
-      String1 :: string(),
-      String2 :: string().
-
-nonl([10]) -> [];
-nonl([]) -> [];
-nonl([H|T]) -> [H|nonl(T)].
-
 -spec send(To, Msg) -> Msg when
       To :: pid() | atom() | {atom(), node()},
       Msg :: term().
diff --git a/lib/tools/test/eprof_SUITE_data/eed.erl b/lib/tools/test/eprof_SUITE_data/eed.erl
index 5f2a21aa60..73531d8b99 100644
--- a/lib/tools/test/eprof_SUITE_data/eed.erl
+++ b/lib/tools/test/eprof_SUITE_data/eed.erl
@@ -54,7 +54,7 @@ edit(Name) ->
 
 loop(St0) ->
     {ok, St1, Cmd} = get_line(St0),
-    case catch command(lib:nonl(Cmd), St1) of
+    case catch command(nonl(Cmd), St1) of
 	{'EXIT', Reason} ->
 	    %% XXX Should clear outstanding global command here.
 	    loop(print_error({'EXIT', Reason}, St1));
@@ -66,6 +66,10 @@ loop(St0) ->
 	    loop(St2)
     end.
 
+nonl([10]) -> [];
+nonl([]) -> [];
+nonl([H|T]) -> [H|nonl(T)].
+
 command(Cmd, St) ->
     case parse_command(Cmd, St) of
 	quit ->
-- 
cgit v1.2.3