AkkomaGang/rdf-ex
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix code style

Browse source
This commit is contained in:
Marcel Otto 2022-04-10 23:09:44 +02:00
parent 3cba749945
commit aeea8c2245
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/rdf/prefix_map.ex
View file

@ -130,9 +130,8 @@ defmodule RDF.PrefixMap do
def merge(prefix_map1, prefix_map2)
def merge(%__MODULE__{map: map1}, %__MODULE__{map: map2}) do
with [] <- merge_conflicts(map1, map2) do
{:ok, %__MODULE__{map: Map.merge(map1, map2)}}
else
case merge_conflicts(map1, map2) do
[] -> {:ok, %__MODULE__{map: Map.merge(map1, map2)}}
conflicts -> {:error, conflicts}
end
end
@ -193,10 +192,10 @@ defmodule RDF.PrefixMap do
end
end
with resolved_merge = Map.merge(map1, map2, conflict_resolution),
[] <- resolved_merge_rest_conflicts(resolved_merge) do
{:ok, %__MODULE__{map: resolved_merge}}
else
resolved_merge = Map.merge(map1, map2, conflict_resolution)
case resolved_merge_rest_conflicts(resolved_merge) do
[] -> {:ok, %__MODULE__{map: resolved_merge}}
conflicts -> {:error, conflicts}
end
end