Replace *strip with trim* calls and optimize around

Author: lexmag

lib/elixir/lib/io/ansi/docs.ex

@@ -58,7 +58,7 @@ defmodule IO.ANSI.Docs do
     options = Keyword.merge(default_options, options)
     doc
     |> String.split(["\r\n", "\n"], trim: false)
-    |> Enum.map(&String.rstrip/1)
+    |> Enum.map(&String.trim_trailing/1)
     |> process([], "", options)
   end
 
@@ -68,19 +68,19 @@ defmodule IO.ANSI.Docs do
 
   defp process(["# " <> heading | rest], text, indent, options) do
     write_text(text, indent, options)
-    write_h1(String.strip(heading), options)
+    write_h1(String.trim(heading), options)
     process(rest, [], "", options)
   end
 
   defp process(["## " <> heading | rest], text, indent, options) do
     write_text(text, indent, options)
-    write_h2(String.strip(heading), options)
+    write_h2(String.trim(heading), options)
     process(rest, [], "", options)
   end
 
   defp process(["### " <> heading | rest], text, indent, options) do
     write_text(text, indent, options)
-    write_h3(String.strip(heading), indent, options)
+    write_h3(String.trim(heading), indent, options)
     process(rest, [], "", options)
   end
 
@@ -285,8 +285,8 @@ defmodule IO.ANSI.Docs do
 
   defp split_into_columns(line, options) do
     line
-    |> String.strip(?|)
-    |> String.strip()
+    |> String.trim("|")
+    |> String.trim()
     |> String.split(~r/\s\|\s/)
     |> Enum.map(&render_column(&1, options))
   end

lib/elixir/lib/option_parser.ex

@@ -374,7 +374,7 @@ defmodule OptionParser do
   """
   @spec split(String.t) :: argv
   def split(string) do
-    do_split(strip_leading_spaces(string), "", [], nil)
+    do_split(String.trim_leading(string, " "), "", [], nil)
   end
 
   # If we have an escaped quote, simply remove the escape
@@ -395,7 +395,7 @@ defmodule OptionParser do
 
   # If we have space and we are outside of a quote, start new segment
   defp do_split(<<?\s, t::binary>>, buffer, acc, nil),
-    do: do_split(strip_leading_spaces(t), "", [buffer | acc], nil)
+    do: do_split(String.trim_leading(t, " "), "", [buffer | acc], nil)
 
   # All other characters are moved to buffer
   defp do_split(<<h, t::binary>>, buffer, acc, quote) do
@@ -414,9 +414,6 @@ defmodule OptionParser do
     raise "argv string did not terminate properly, a #{<<marker>>} was opened but never closed"
   end
 
-  defp strip_leading_spaces(" " <> t), do: strip_leading_spaces(t)
-  defp strip_leading_spaces(t), do: t
-
   ## Helpers
 
   defp compile_config(opts) do
@@ -618,7 +615,7 @@ defmodule OptionParser do
   end
 
   defp get_type(option, opts, types) do
-    option_key = option |> String.lstrip(?-) |> get_option()
+    option_key = option |> String.trim_leading("-") |> get_option()
 
     if option_alias = opts[:aliases][option_key] do
       types[option_alias]

lib/elixir/test/elixir/io/ansi/docs_test.exs

@@ -5,11 +5,11 @@ defmodule IO.ANSI.DocsTest do
   import ExUnit.CaptureIO
 
   def format_heading(str) do
-    capture_io(fn -> IO.ANSI.Docs.print_heading(str, []) end) |> String.rstrip
+    capture_io(fn -> IO.ANSI.Docs.print_heading(str, []) end) |> String.trim_trailing
   end
 
   def format(str) do
-    capture_io(fn -> IO.ANSI.Docs.print(str, []) end) |> String.rstrip
+    capture_io(fn -> IO.ANSI.Docs.print(str, []) end) |> String.trim_trailing
   end
 
   test "heading is formatted" do

lib/elixir/test/elixir/kernel/warning_test.exs

@@ -273,13 +273,13 @@ defmodule Kernel.WarningTest do
     output = capture_err(fn ->
       Code.compile_string """
       defmodule Sample do
-        import String, only: [upcase: 1, downcase: 1, strip: 1]
+        import String, only: [upcase: 1, downcase: 1, trim: 1]
         def a, do: upcase("hello")
       end
       """
     end)
     assert output =~ "unused import String.downcase/1"
-    assert output =~ "unused import String.strip/1"
+    assert output =~ "unused import String.trim/1"
   after
     purge Sample
   end

lib/elixir/test/elixir/system_test.exs

@@ -18,7 +18,7 @@ defmodule SystemTest do
 
     version_file = Path.join([__DIR__, "../../../..", "VERSION"]) |> Path.expand
     {:ok, version} = File.read(version_file)
-    assert build_info[:version] == String.strip(version)
+    assert build_info[:version] == String.trim(version)
     assert build_info[:build] != ""
   end
 

lib/ex_unit/lib/ex_unit/doc_test.ex

@@ -300,7 +300,7 @@ defmodule ExUnit.DocTest do
         actual ->
           reraise ExUnit.AssertionError,
             [message: "Doctest failed",
-             expr: "#{unquote(String.strip(expr))} === #{unquote(String.strip(expected))}",
+             expr: "#{unquote(String.trim(expr))} === #{unquote(String.trim(expected))}",
              left: actual],
             unquote(stack)
       end
@@ -318,7 +318,7 @@ defmodule ExUnit.DocTest do
         actual ->
           reraise ExUnit.AssertionError,
             [message: "Doctest failed",
-             expr: "inspect(#{unquote(String.strip(expr))}) === #{unquote(String.strip(expected))}",
+             expr: "inspect(#{unquote(String.trim(expr))}) === #{unquote(String.trim(expected))}",
              left: actual],
             unquote(stack)
       end
@@ -330,7 +330,7 @@ defmodule ExUnit.DocTest do
 
     quote do
       stack = unquote(stack)
-      expr  = unquote(String.strip(expr))
+      expr  = unquote(String.trim(expr))
       spec  = inspect(unquote(exception)) <> " with message " <> inspect(unquote(message))
 
       try do
@@ -369,7 +369,7 @@ defmodule ExUnit.DocTest do
         quote do
           reraise ExUnit.AssertionError,
             [message: "Doctest did not compile, got: #{unquote(message)}",
-             expr: unquote(String.strip(expr))],
+             expr: unquote(String.trim(expr))],
             unquote(stack)
         end
     end
@@ -429,7 +429,7 @@ defmodule ExUnit.DocTest do
   end
 
   defp adjust_indent(:text, [line | rest], line_no, adjusted_lines, indent, module) do
-    case String.starts_with?(String.lstrip(line), @iex_prompt) do
+    case String.starts_with?(String.trim_leading(line), @iex_prompt) do
       true  ->
         adjust_indent(:prompt, [line | rest], line_no, adjusted_lines, get_indent(line, indent), module)
       false ->
@@ -440,7 +440,7 @@ defmodule ExUnit.DocTest do
   defp adjust_indent(kind, [line | rest], line_no, adjusted_lines, indent, module) when kind in [:prompt, :after_prompt] do
     stripped_line = strip_indent(line, indent)
 
-    case String.lstrip(line) do
+    case String.trim_leading(line) do
       "" ->
         raise Error, line: line_no, module: module,
                      message: "expected non-blank line to follow iex> prompt"
@@ -472,7 +472,7 @@ defmodule ExUnit.DocTest do
     cond do
       stripped_line == "" ->
         adjust_indent(:text, rest, line_no + 1, [{stripped_line, line_no} | adjusted_lines], 0, module)
-      String.starts_with?(String.lstrip(line), @iex_prompt) ->
+      String.starts_with?(String.trim_leading(line), @iex_prompt) ->
         adjust_indent(:prompt, [line | rest], line_no, adjusted_lines, indent, module)
       true ->
         adjust_indent(:code, rest, line_no + 1, [{stripped_line, line_no} | adjusted_lines], indent, module)
@@ -587,7 +587,7 @@ defmodule ExUnit.DocTest do
     case string do
       "** (" <> error ->
         [mod, message] = :binary.split(error, ")")
-        {:error, Module.concat([mod]), String.lstrip(message)}
+        {:error, Module.concat([mod]), String.trim_leading(message)}
       _ ->
         if string =~ ~r/^#[A-Z][\w\.]*<.*>$/ do
           {:inspect, inspect(string)}

lib/iex/lib/iex/helpers.ex

@@ -399,7 +399,7 @@ defmodule IEx.Helpers do
     info = ["Term": inspect(term)] ++ IEx.Info.info(term)
 
     for {subject, info} <- info do
-      info = info |> to_string() |> String.strip() |> String.replace("\n", "\n  ")
+      info = info |> to_string() |> String.trim() |> String.replace("\n", "\n  ")
       IO.puts IEx.color(:eval_result, to_string(subject))
       IO.puts IEx.color(:eval_info, "  #{info}")
     end

lib/iex/test/iex/helpers_test.exs

@@ -217,7 +217,7 @@ defmodule IEx.HelpersTest do
     File.cd! iex_path, fn ->
       paths = capture_io(fn -> ls end)
               |> String.split
-              |> Enum.map(&String.strip(&1))
+              |> Enum.map(&String.trim/1)
 
       assert "ebin" in paths
       assert "mix.exs" in paths
@@ -444,7 +444,7 @@ defmodule IEx.HelpersTest do
 
   test "i helper" do
     output = capture_iex ~s[i(:ok)]
-    assert output == String.rstrip("""
+    assert output == String.trim_trailing("""
     Term
       :ok
     Data type

lib/iex/test/test_helper.exs

@@ -65,12 +65,9 @@ defmodule IEx.Case do
 
   defp strip_iex(string) do
     string
-    |> strip_line   # strip the greeting
-    |> String.strip
-  end
-
-  defp strip_line(string) do
-    Regex.replace ~r/\A.+?$/ms, string, ""
+    |> String.split("\n", parts: 2) # trim the greeting
+    |> Enum.at(1)
+    |> String.trim
   end
 end
 

lib/mix/lib/mix/tasks/compile.ex

@@ -127,6 +127,6 @@ defmodule Mix.Tasks.Compile do
   end
 
   defp first_line(doc) do
-    String.split(doc, "\n", parts: 2) |> hd |> String.strip |> String.rstrip(?.)
+    String.split(doc, "\n", parts: 2) |> hd |> String.trim |> String.trim_trailing(".")
   end
 end