Permalink
Browse files

Release v0.12.0

  • Loading branch information...
1 parent f1e647f commit 6d3624147e234a646be3707602e920ac3d48cd17 @josevalim josevalim committed Dec 15, 2013
Showing with 7 additions and 7 deletions.
  1. +1 −1 CHANGELOG.md
  2. +1 −1 VERSION
  3. +3 −3 lib/elixir/lib/kernel/typespec.ex
  4. +1 −1 lib/elixir/test/elixir/typespec_test.exs
  5. +1 −1 src/elixir.app.src
View
2 CHANGELOG.md
@@ -1,4 +1,4 @@
-# v0.11.3-dev
+# v0.12.0 (2013-12-15)
* Enhancements
* [Exception] Allow `exception/1` to be overriden and promote it as the main mechanism to customize exceptions
View
2 VERSION
@@ -1 +1 @@
-0.11.3-dev
+0.12.0
View
6 lib/elixir/lib/kernel/typespec.ex
@@ -484,15 +484,15 @@ defmodule Kernel.Typespec do
## To AST conversion
- defp collect_vars({ :ann_type, _line, args }) do
+ defp collect_vars({ :ann_type, _line, args }) when is_list(args) do
Enum.flat_map(args, &collect_vars/1)
end
- defp collect_vars({ :type, _line, _kind, args }) do
+ defp collect_vars({ :type, _line, _kind, args }) when is_list(args) do
Enum.flat_map(args, &collect_vars/1)
end
- defp collect_vars({ :remote_type, _line, args }) do
+ defp collect_vars({ :remote_type, _line, args }) when is_list(args) do
Enum.flat_map(args, &collect_vars/1)
end
View
2 lib/elixir/test/elixir/typespec_test.exs
@@ -454,7 +454,7 @@ defmodule Typespec.TypeTest do
test "spec_to_ast" do
specs = [
(quote do: @spec a() :: integer()),
- (quote do: @spec a(atom()) :: integer()),
+ (quote do: @spec a(atom()) :: integer() | [{}]),
(quote do: @spec a(b) :: integer() when [b: integer()]),
(quote do: @spec a(b) :: b when [b: var])
]
View
2 src/elixir.app.src
@@ -1,6 +1,6 @@
{application, elixir,
[{description, "elixir"},
- {vsn, "0.11.3-dev"},
+ {vsn, "0.12.0"},
{modules, [
elixir
]},

0 comments on commit 6d36241

Please sign in to comment.