From 9dbc97eedcb3664f7a97a962391b67d1fa0b88b2 Mon Sep 17 00:00:00 2001 From: Gary Rennie Date: Fri, 25 Jan 2019 12:11:12 +0000 Subject: [PATCH] Don't use into with a non-empty list as this is deprecated in 1.8.0 See https://github.com/elixir-lang/elixir/commit/6023568bcfe48f74c8b1bca485f9f9c984ab0664 Closes #120 --- lib/phoenix/tracker/state.ex | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/phoenix/tracker/state.ex b/lib/phoenix/tracker/state.ex index 00ba99c4a..1d2d0291d 100644 --- a/lib/phoenix/tracker/state.ex +++ b/lib/phoenix/tracker/state.ex @@ -379,10 +379,11 @@ defmodule Phoenix.Tracker.State do merged_vals = for {tag, value} <- remote_values, not match?(%{^tag => _}, local_values) and not in?(local_context, local_clouds, tag), - into: filtered_locals, do: {tag, value} - {:ok, %State{local | clouds: clouds, values: Map.new(merged_vals), range: {new_start, new_end}}} + all_vals = filtered_locals ++ merged_vals + + {:ok, %State{local | clouds: clouds, values: Map.new(all_vals), range: {new_start, new_end}}} else {:error, :not_contiguous} end