updated depwarn for @submodel and tests

Author: torfjelde

src/submodel_macro.jl

@@ -6,7 +6,7 @@ Run a Turing `model` nested inside of a Turing model.
 
 !!! warning
     This is deprecated and will be removed in a future release.
-    Use `left ~ to_submodel(model)` instead (see [`to_submodel(model)`](@ref)).
+    Use `left ~ to_submodel(model)` instead (see [`to_submodel`](@ref)).
 
 # Examples
 
@@ -25,7 +25,7 @@ julia> @model function demo2(x, y)
 When we sample from the model `demo2(missing, 0.4)` random variable `x` will be sampled:
 ```jldoctest submodel
 julia> vi = VarInfo(demo2(missing, 0.4));
-┌ Warning: `@submodel model` is deprecated, use `left ~ to_submodel(model)` instead.
+┌ Warning: `@submodel model` and `@submodel prefix=... model` are deprecated; see `to_submodel` for the up-to-date syntax.
 │   caller = ip:0x0
 └ @ Core :-1
 
@@ -92,7 +92,7 @@ When we sample from the model `demo2(missing, missing, 0.4)` random variables `s
 `sub2.x` will be sampled:
 ```jldoctest submodelprefix
 julia> vi = VarInfo(demo2(missing, missing, 0.4));
-┌ Warning: `@submodel model` is deprecated, use `to_submodel(model)` instead.
+┌ Warning: `@submodel model` and `@submodel prefix=... model` are deprecated; see `to_submodel` for the up-to-date syntax.
 │   caller = ip:0x0
 └ @ Core :-1
 
@@ -138,7 +138,7 @@ julia> # When `prefix` is unspecified, no prefix is used.
 submodel_noprefix (generic function with 2 methods)
 
 julia> @varname(x) in keys(VarInfo(submodel_noprefix()))
-┌ Warning: `@submodel model` is deprecated, use `left ~ to_submodel(model)` instead.
+┌ Warning: `@submodel model` and `@submodel prefix=... model` are deprecated; see `to_submodel` for the up-to-date syntax.
 │   caller = ip:0x0
 └ @ Core :-1
 true
@@ -224,7 +224,7 @@ function prefix_submodel_context(prefix::Bool, ctx)
     return ctx
 end
 
-const SUBMODEL_DEPWARN_MSG = "`@submodel model` and `@submodel prefix=... model` are deprecated, use `left ~ to_submodel(model)` and `left ~ to_submodel(prefix(model, ...))`, respectively, instead."
+const SUBMODEL_DEPWARN_MSG = "`@submodel model` and `@submodel prefix=... model` are deprecated; see `to_submodel` for the up-to-date syntax."
 
 function submodel(prefix_expr, expr, ctx=esc(:__context__))
     prefix_left, prefix = getargs_assignment(prefix_expr)

test/compiler.jl

@@ -388,7 +388,7 @@ module Issue537 end
         @test_logs(
             (
                 :warn,
-                "`@submodel model` and `@submodel prefix=... model` are deprecated, use `left ~ to_submodel(model)` and `left ~ to_submodel(prefix(model, ...))`, respectively, instead.",
+                "`@submodel model` and `@submodel prefix=... model` are deprecated; see `to_submodel` for the up-to-date syntax.",
             ),
             outer()()
         )
@@ -397,7 +397,7 @@ module Issue537 end
         @test_logs(
             (
                 :warn,
-                "`@submodel model` and `@submodel prefix=... model` are deprecated, use `left ~ to_submodel(model)` and `left ~ to_submodel(prefix(model, ...))`, respectively, instead.",
+                "`@submodel model` and `@submodel prefix=... model` are deprecated; see `to_submodel` for the up-to-date syntax.",
             ),
             outer_with_prefix()()
         )
@@ -490,7 +490,7 @@ module Issue537 end
             num_steps = length(y[1])
             num_obs = length(y)
             @inbounds for i in 1:num_obs
-                x ~ to_submodel(prefix(AR1(num_steps, α, μ, σ), "ar1_$i"))
+                x ~ to_submodel(prefix(AR1(num_steps, α, μ, σ), "ar1_$i"), false)
                 y[i] ~ MvNormal(x, 0.01 * I)
             end
         end

test/debug_utils.jl

@@ -45,14 +45,16 @@
         @testset "submodel" begin
             @model ModelInner() = x ~ Normal()
             @model function ModelOuterBroken()
-                z ~ to_submodel(ModelInner())
+                # Without automatic prefixing => `x` s used twice.
+                z ~ to_submodel(ModelInner(), false)
                 return x ~ Normal()
             end
             model = ModelOuterBroken()
             @test_throws ErrorException check_model(model; error_on_failure=true)
 
             @model function ModelOuterWorking()
-                z = to_submodel(prefix(ModelInner(), "z"))
+                # With automatic prefixing => `x` is not duplicated.
+                z ~ to_submodel(ModelInner())
                 x ~ Normal()
                 return z
             end