Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions lib/elixir/lib/keyword.ex
Original file line number Diff line number Diff line change
Expand Up @@ -1342,9 +1342,9 @@ defmodule Keyword do
"""
@spec pop(t, key, default) :: {value | default, t}
def pop(keywords, key, default \\ nil) when is_list(keywords) and is_atom(key) do
case fetch(keywords, key) do
{:ok, value} -> {value, delete(keywords, key)}
:error -> {default, keywords}
case :lists.keyfind(key, 1, keywords) do
{^key, value} -> {value, delete_key(keywords, key)}
false -> {default, keywords}
end
end

Expand All @@ -1369,9 +1369,9 @@ defmodule Keyword do
@doc since: "1.10.0"
@spec pop!(t, key) :: {value, t}
def pop!(keywords, key) when is_list(keywords) and is_atom(key) do
case fetch(keywords, key) do
{:ok, value} -> {value, delete(keywords, key)}
:error -> raise KeyError, key: key, term: keywords
case :lists.keyfind(key, 1, keywords) do
{^key, value} -> {value, delete_key(keywords, key)}
false -> raise KeyError, key: key, term: keywords
end
end

Expand Down Expand Up @@ -1434,9 +1434,9 @@ defmodule Keyword do
@spec pop_lazy(t, key, (-> value)) :: {value, t}
def pop_lazy(keywords, key, fun)
when is_list(keywords) and is_atom(key) and is_function(fun, 0) do
case fetch(keywords, key) do
{:ok, value} -> {value, delete(keywords, key)}
:error -> {fun.(), keywords}
case :lists.keyfind(key, 1, keywords) do
{^key, value} -> {value, delete_key(keywords, key)}
false -> {fun.(), keywords}
end
end

Expand Down
Loading