Skip to content

Commit

Permalink
Merge pull request #58 from JamesS237/master
Browse files Browse the repository at this point in the history
Add support for Elixir v1.0.0-rc1
  • Loading branch information
ericmj committed Aug 31, 2014
2 parents 57ff66f + c4d1e35 commit 944d5d1
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion lib/hex/registry.ex
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ defmodule Hex.Registry do
case :ets.lookup(get_tid(), {package, version}) do
[] ->
nil
[{{^package, ^version}, [_, checksum | _]}] when nil?(checksum) or is_binary(checksum) ->
[{{^package, ^version}, [_, checksum | _]}] when is_nil(checksum) or is_binary(checksum) ->
checksum
end
end
Expand Down
2 changes: 1 addition & 1 deletion lib/hex/util.ex
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ defmodule Hex.Util do
do: binary
defp binarify(number) when is_number(number),
do: number
defp binarify(atom) when nil?(atom) or is_boolean(atom),
defp binarify(atom) when is_nil(atom) or is_boolean(atom),
do: atom
defp binarify(atom) when is_atom(atom),
do: Atom.to_string(atom)
Expand Down
4 changes: 2 additions & 2 deletions lib/mix/tasks/hex/user.ex
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ defmodule Mix.Tasks.Hex.User do
new_email = Mix.shell.prompt("Email:") |> String.strip |> nillify
new_password = Util.password_get("Password:", clean?) |> String.strip |> nillify

unless nil?(new_password) do
unless is_nil(new_password) do
confirm = Util.password_get("Password (confirm):", clean?) |> String.strip |> nillify
if password != confirm do
Mix.raise "Entered passwords do not match"
Expand Down Expand Up @@ -118,7 +118,7 @@ defmodule Mix.Tasks.Hex.User do
email = Mix.shell.prompt("Email:") |> String.strip
password = Util.password_get("Password:", clean?) |> String.strip

unless nil?(password) do
unless is_nil(password) do
confirm = Util.password_get("Password (confirm):", clean?) |> String.strip
if password != confirm do
Mix.raise "Entered passwords do not match"
Expand Down
2 changes: 1 addition & 1 deletion mix.exs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ defmodule Hex.Mixfile do
def project do
[app: :hex,
version: "0.4.2-dev",
elixir: "~> 0.15.0",
elixir: "~> 1.0.0-rc1",
aliases: aliases,
deps: deps]
end
Expand Down

0 comments on commit 944d5d1

Please sign in to comment.