Skip to content

Commit 6b8ef31

Browse files
IanButterworthKristofferC
authored andcommitted
Fix no-arg ScopedValues.@with within a scope (#56019)
Fixes #56017 (cherry picked from commit 57e3c9e)
1 parent a1b972f commit 6b8ef31

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

base/scopedvalues.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,8 @@ struct Scope
8585
values::ScopeStorage
8686
end
8787

88+
Scope(scope::Scope) = scope
89+
8890
function Scope(parent::Union{Nothing, Scope}, key::ScopedValue{T}, value) where T
8991
val = convert(T, value)
9092
if parent === nothing

test/scopedvalues.jl

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,12 @@ end
135135
@test sval[] == 1
136136
@test sval_float[] == 1.0
137137
end
138+
@with sval=>2 sval_float=>2.0 begin
139+
@with begin
140+
@test sval[] == 2
141+
@test sval_float[] == 2.0
142+
end
143+
end
138144
end
139145

140146
@testset "isassigned" begin

0 commit comments

Comments
 (0)