Move to capture syntax

Author: José Valim

lib/eex/lib/eex/compiler.ex

@@ -68,7 +68,7 @@ defmodule EEx.Compiler do
     else
       key = length(state.dict)
       placeholder = '__EEX__(' ++ integer_to_list(key) ++ ');'
-      { current ++ placeholder ++ new_lines ++ chars, state.update_dict([{key, buffer}|&1]) }
+      { current ++ placeholder ++ new_lines ++ chars, state.update_dict(&[{key, buffer}|&1]) }
     end
   end
 
@@ -108,7 +108,7 @@ defmodule EEx.Compiler do
   end
 
   defp insert_quotes(list, dict) when is_list(list) do
-    Enum.map list, insert_quotes(&1, dict)
+    Enum.map list, &insert_quotes(&1, dict)
   end
 
   defp insert_quotes(other, _dict) do

lib/eex/lib/eex/tokenizer.ex

@@ -136,7 +136,7 @@ defmodule EEx.Tokenizer do
   end
 
   defp end_index(tokens) do
-    Enum.find_index(tokens, match?({ :end, _ }, &1)) || :infinity
+    Enum.find_index(tokens, &match?({ :end, _ }, &1)) || :infinity
   end
 
   defp check_spaces(string, token) do

lib/elixir/lib/code.ex

@@ -166,7 +166,7 @@ defmodule Code do
   end
 
   defp validate_requires(kind, requires) do
-    valid = is_list(requires) and Enum.all?(requires, is_atom(&1))
+    valid = is_list(requires) and Enum.all?(requires, &is_atom(&1))
 
     unless valid do
       raise ArgumentError, "expected :#{kind} option given to eval in the format: [module]"

lib/elixir/lib/enum.ex

@@ -473,7 +473,7 @@ defmodule Enum do
 
   ## Examples
 
-      iex> Enum.filter_map([1, 2, 3], fn(x) -> rem(x, 2) == 0 end, &1 * 2)
+      iex> Enum.filter_map([1, 2, 3], fn(x) -> rem(x, 2) == 0 end, &(&1 * 2))
       [4]
 
   """
@@ -892,8 +892,8 @@ defmodule Enum do
   end
 
   def sort(collection) do
-    fun = &1 <= &2
-    Enumerable.reduce(collection, [], sort_reducer(&1, &2, fun)) |>
+    fun = &(&1 <= &2)
+    Enumerable.reduce(collection, [], &sort_reducer(&1, &2, fun)) |>
       sort_terminator(fun)
   end
 
@@ -912,7 +912,7 @@ defmodule Enum do
   end
 
   def sort(collection, fun) do
-    Enumerable.reduce(collection, [], sort_reducer(&1, &2, fun)) |>
+    Enumerable.reduce(collection, [], &sort_reducer(&1, &2, fun)) |>
       sort_terminator(fun)
   end
 

lib/elixir/lib/file.ex

@@ -938,7 +938,7 @@ defmodule File do
   """
   def ls(path // ".") do
     case F.list_dir(path) do
-      { :ok, file_list } -> { :ok, Enum.map(file_list, to_string(&1)) }
+      { :ok, file_list } -> { :ok, Enum.map(file_list, &to_string(&1)) }
       { :error, _ } = error -> error
     end
   end

lib/elixir/lib/gen_fsm/behaviour.ex

@@ -60,7 +60,7 @@ defmodule GenFSM.Behaviour do
           end
 
           def short_paid(:coin, state_data) do
-            { :next_state, :paid_in_full, state_data.update_coins(&1 + 1) }
+            { :next_state, :paid_in_full, &state_data.update_coins(&1 + 1) }
           end
 
           def short_paid(:request_coffee, state_data) do
@@ -84,7 +84,7 @@ defmodule GenFSM.Behaviour do
 
 
           def paid_in_full(:coin, state_data) do
-            { :next_state, :paid_in_full, state_data.update_coins(&1 + 1) }
+            { :next_state, :paid_in_full, &state_data.update_coins(&1 + 1) }
           end
 
           def paid_in_full(:request_coffee, _state_data) do

lib/elixir/lib/hash_dict.ex

@@ -153,13 +153,13 @@ defmodule HashDict do
 
   def merge(dict1, dict2, callback) when is_record(dict1, HashDict) and is_record(dict2, HashDict) and elem(dict1, 1) < elem(dict2, 1) do
     dict_fold dict1, dict2, fn [k|v1], acc ->
-      update(acc, k, v1, callback.(k, v1, &1))
+      update(acc, k, v1, &callback.(k, v1, &1))
     end
   end
 
   def merge(dict1, dict2, callback) when is_record(dict1, HashDict) and is_record(dict2, HashDict) do
     dict_fold dict2, dict1, fn [k|v2], acc ->
-      update(acc, k, v2, callback.(k, &1, v2))
+      update(acc, k, v2, &callback.(k, &1, v2))
     end
   end
 

lib/elixir/lib/hash_set.ex

@@ -103,7 +103,7 @@ defmodule HashSet do
   end
 
   def to_list(set) do
-    set_fold(set, [], [&1|&2]) |> :lists.reverse
+    set_fold(set, [], &[&1|&2]) |> :lists.reverse
   end
 
   def put(set, member) do

lib/elixir/lib/inspect.ex

@@ -267,9 +267,9 @@ defimpl Inspect, for: List do
       :io_lib.printable_list(thing) ->
         << ?', Inspect.BitString.escape(String.from_char_list!(thing), ?') :: binary, ?' >>
       keyword?(thing) && not opts.raw ->
-        surround_many("[", thing, "]", opts.limit, keyword(&1, opts))
+        surround_many("[", thing, "]", opts.limit, &keyword(&1, opts))
       true ->
-        surround_many("[", thing, "]", opts.limit, Kernel.inspect(&1, opts))
+        surround_many("[", thing, "]", opts.limit, &Kernel.inspect(&1, opts))
     end
   end
 
@@ -317,7 +317,7 @@ defimpl Inspect, for: Tuple do
   def inspect(tuple, opts) do
     unless opts.raw do
       record_inspect(tuple, opts)
-    end || surround_many("{", tuple_to_list(tuple), "}", opts.limit, Kernel.inspect(&1, opts))
+    end || surround_many("{", tuple_to_list(tuple), "}", opts.limit, &Kernel.inspect(&1, opts))
   end
 
   ## Helpers
@@ -331,7 +331,7 @@ defimpl Inspect, for: Tuple do
       else
         surround_record(name, fields, tail, opts)
       end
-    end || surround_many("{", [name|tail], "}", opts.limit, Kernel.inspect(&1, opts))
+    end || surround_many("{", [name|tail], "}", opts.limit, &Kernel.inspect(&1, opts))
   end
 
   defp record_fields(name) do
@@ -351,7 +351,7 @@ defimpl Inspect, for: Tuple do
 
     concat(
       Inspect.Atom.inspect(name, opts),
-      surround_many("[", Enum.zip(fields, tail), "]", opts.limit, keyword(&1, opts))
+      surround_many("[", Enum.zip(fields, tail), "]", opts.limit, &keyword(&1, opts))
     )
   end
 

lib/elixir/lib/inspect/algebra.ex

@@ -113,7 +113,7 @@ defmodule Inspect.Algebra do
   Concatenates a list of documents.
   """
   @spec concat([t]) :: doc_cons_t
-  def concat(docs), do: folddoc(docs, concat(&1, &2))
+  def concat(docs), do: folddoc(docs, &concat(&1, &2))
 
   @doc """
   Nests document entity `x` positions deep. Nesting will be
@@ -273,11 +273,11 @@ defmodule Inspect.Algebra do
 
   ## Examples
 
-      iex> doc = Inspect.Algebra.surround_many("[", Enum.to_list(1..5), "]", :infinity, integer_to_binary(&1))
+      iex> doc = Inspect.Algebra.surround_many("[", Enum.to_list(1..5), "]", :infinity, &integer_to_binary(&1))
       iex> Inspect.Algebra.pretty(doc, 5)
       "[1,\n 2,\n 3,\n 4,\n 5]"
 
-      iex> doc = Inspect.Algebra.surround_many("[", Enum.to_list(1..5), "]", 3, integer_to_binary(&1))
+      iex> doc = Inspect.Algebra.surround_many("[", Enum.to_list(1..5), "]", 3, &integer_to_binary(&1))
       iex> Inspect.Algebra.pretty(doc, 20)
       "[1, 2, 3, ...]"