Remove 3-argument evaluate!! as well

Author: penelopeysm

src/model.jl

@@ -864,12 +864,6 @@ If multiple threads are available, the varinfo provided will be wrapped in a
 
 Returns a tuple of the model's return value, plus the updated `varinfo`
 (unwrapped if necessary).
-
-    evaluate!!(model::Model, varinfo, context)
-
-When an extra context stack is provided, the model's context is inserted into
-that context stack. See `combine_model_and_external_contexts`. This method is
-deprecated.
 """
 function AbstractPPL.evaluate!!(model::Model, varinfo::AbstractVarInfo)
     return if use_threadsafe_eval(model.context, varinfo)
@@ -878,17 +872,6 @@ function AbstractPPL.evaluate!!(model::Model, varinfo::AbstractVarInfo)
         evaluate_threadunsafe!!(model, varinfo)
     end
 end
-function AbstractPPL.evaluate!!(
-    model::Model, varinfo::AbstractVarInfo, context::AbstractContext
-)
-    Base.depwarn(
-        "The `context` argument to evaluate!!(model, varinfo, context) is deprecated.",
-        :dynamicppl_evaluate_context,
-    )
-    new_ctx = combine_model_and_external_contexts(model.context, context)
-    model = contextualize(model, new_ctx)
-    return evaluate!!(model, varinfo)
-end
 
 """
     evaluate_threadunsafe!!(model, varinfo)
@@ -940,32 +923,6 @@ end
 
 is_splat_symbol(s::Symbol) = startswith(string(s), "#splat#")
 
-"""
-    combine_model_and_external_contexts(model_context, external_context)
-
-Combine a context from a model and an external context into a single context.
-
-The resulting context stack has the following structure:
-
-    `external_context` -> `childcontext(external_context)` -> ... ->
-    `model_context` -> `childcontext(model_context)` -> ... ->
-    `leafcontext(external_context)`
-
-The reason for this is that we want to give `external_context` precedence over
-`model_context`, while also preserving the leaf context of `external_context`.
-We can do this by
-
-1. Set the leaf context of `model_context` to `leafcontext(external_context)`.
-2. Set leaf context of `external_context` to the context resulting from (1).
-"""
-function combine_model_and_external_contexts(
-    model_context::AbstractContext, external_context::AbstractContext
-)
-    return setleafcontext(
-        external_context, setleafcontext(model_context, leafcontext(external_context))
-    )
-end
-
 """
     make_evaluate_args_and_kwargs(model, varinfo)
 

src/test_utils/contexts.jl

@@ -63,10 +63,12 @@ function test_context(context::DynamicPPL.AbstractContext, model::DynamicPPL.Mod
     # TODO(torfjelde): Make the `varinfo` used for testing a kwarg once it makes sense for other varinfos.
     # Untyped varinfo.
     varinfo_untyped = DynamicPPL.VarInfo()
-    @test (DynamicPPL.evaluate!!(model, varinfo_untyped, SamplingContext(context)); true)
-    @test (DynamicPPL.evaluate!!(model, varinfo_untyped, context); true)
+    model_with_spl = contextualize(model, SamplingContext(context))
+    model_without_spl = contextualize(model, context)
+    @test DynamicPPL.evaluate!!(model_with_spl, varinfo_untyped) isa Any
+    @test DynamicPPL.evaluate!!(model_without_spl, varinfo_untyped) isa Any
     # Typed varinfo.
     varinfo_typed = DynamicPPL.typed_varinfo(varinfo_untyped)
-    @test (DynamicPPL.evaluate!!(model, varinfo_typed, SamplingContext(context)); true)
-    @test (DynamicPPL.evaluate!!(model, varinfo_typed, context); true)
+    @test DynamicPPL.evaluate!!(model_with_spl, varinfo_typed) isa Any
+    @test DynamicPPL.evaluate!!(model_without_spl, varinfo_typed) isa Any
 end