First couple of 1.19 fixes

Author: PragTob

lib/benchee/benchmark/runner.ex

@@ -302,7 +302,7 @@ defmodule Benchee.Benchmark.Runner do
     Enum.reverse(measurements)
   end
 
-  defp do_benchmark(scenario, scenario_context, collector, measurements) do
+  defp do_benchmark(scenario, %ScenarioContext{} = scenario_context, collector, measurements) do
     measurement = collect(scenario, scenario_context, collector)
 
     updated_context = %ScenarioContext{

lib/benchee/formatter.ex

@@ -197,7 +197,7 @@ defmodule Benchee.Formatter do
     update_in(suite.configuration, &scrub_configuration/1)
   end
 
-  defp scrub_scenario(scenario) do
+  defp scrub_scenario(%Scenario{} = scenario) do
     %Scenario{scenario | function: nil, input: nil}
   end
 

lib/benchee/scenario_loader.ex

@@ -15,7 +15,7 @@ defmodule Benchee.ScenarioLoader do
   Load the file(s) specified as `load_path` and add the scenarios to the list of the
   current scenarios in the suite.
   """
-  def load(suite = %{configuration: %{load: load_path}, scenarios: scenarios}) do
+  def load(suite = %Suite{configuration: %{load: load_path}, scenarios: scenarios}) do
     loaded = load_scenarios(load_path)
     %Suite{suite | scenarios: scenarios ++ loaded}
   end

test/benchee_test.exs

@@ -767,6 +767,7 @@ defmodule BencheeTest do
     defp without_functions_and_inputs(suite) do
       update_in(suite.scenarios, fn scenarios ->
         Enum.map(scenarios, fn scenario ->
+          %Benchee.Scenario{} = scenario
           %Benchee.Scenario{scenario | function: nil, input: nil}
         end)
       end)