Skip to content

Commit 944d5d1

Browse files
committed
Merge pull request #58 from JamesS237/master
Add support for Elixir v1.0.0-rc1
2 parents 57ff66f + c4d1e35 commit 944d5d1

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

lib/hex/registry.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ defmodule Hex.Registry do
119119
case :ets.lookup(get_tid(), {package, version}) do
120120
[] ->
121121
nil
122-
[{{^package, ^version}, [_, checksum | _]}] when nil?(checksum) or is_binary(checksum) ->
122+
[{{^package, ^version}, [_, checksum | _]}] when is_nil(checksum) or is_binary(checksum) ->
123123
checksum
124124
end
125125
end

lib/hex/util.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ defmodule Hex.Util do
191191
do: binary
192192
defp binarify(number) when is_number(number),
193193
do: number
194-
defp binarify(atom) when nil?(atom) or is_boolean(atom),
194+
defp binarify(atom) when is_nil(atom) or is_boolean(atom),
195195
do: atom
196196
defp binarify(atom) when is_atom(atom),
197197
do: Atom.to_string(atom)

lib/mix/tasks/hex/user.ex

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ defmodule Mix.Tasks.Hex.User do
8989
new_email = Mix.shell.prompt("Email:") |> String.strip |> nillify
9090
new_password = Util.password_get("Password:", clean?) |> String.strip |> nillify
9191

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

121-
unless nil?(password) do
121+
unless is_nil(password) do
122122
confirm = Util.password_get("Password (confirm):", clean?) |> String.strip
123123
if password != confirm do
124124
Mix.raise "Entered passwords do not match"

mix.exs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ defmodule Hex.Mixfile do
44
def project do
55
[app: :hex,
66
version: "0.4.2-dev",
7-
elixir: "~> 0.15.0",
7+
elixir: "~> 1.0.0-rc1",
88
aliases: aliases,
99
deps: deps]
1010
end

0 commit comments

Comments
 (0)