Fix bug in empty!, add tests for WeakKeyDict #19485
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kshyatt
added
bugfix
| @@ -45,7 +45,7 @@ get!{K}(default::Callable, wkh::WeakKeyDict{K}, key) = lock(() -> get!(default, | |||
| pop!{K}(wkh::WeakKeyDict{K}, key) = lock(() -> pop!(wkh.ht, key), wkh) | |||
| pop!{K}(wkh::WeakKeyDict{K}, key, default) = lock(() -> pop!(wkh.ht, key, default), wkh) | |||
| delete!{K}(wkh::WeakKeyDict{K}, key) = lock(() -> delete!(wkh.ht, key), wkh) | |||
| empty!(wkh::WeakKeyDict) = (lock(() -> empty!(wkh.ht)); wkh) | |||
| empty!(wkh::WeakKeyDict) = lock(() -> empty!(wkh.ht), wkh) | |||
There was a problem hiding this comment.
Subtle. What was the bug here?
There was a problem hiding this comment.
Got an exception of type MethodError outside of a @test
MethodError: no method matching lock(::Base.##384#385{WeakKeyDict{Any,Any}})
Closest candidates are:
lock(::Any, !Matched::WeakKeyDict{K,V}) at weakkeydict.jl:21
lock(::Any, !Matched::Any) at lock.jl:99
lock(!Matched::Base.Threads.Mutex) at locks.jl:206
...
in empty!; at ./weakkeydict.jl:48 [inlined]
There was a problem hiding this comment.
Won't this return wkd.ht now, instead of wkd?
There was a problem hiding this comment.
I can add a test for that? We can see.
There was a problem hiding this comment.
Yes, it's returning wkd.ht. Is there an easy way to fix that?
There was a problem hiding this comment.
Perhaps empty!(wkh::WeakKeyDict) = (lock(() -> empty!(wkh.ht), wkh); wkh)? Best!
There was a problem hiding this comment.
That got it. Thanks, @Sacha0
|
CI (except for OSX) passed - OK to merge? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.