Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Define == for Some by forwarding to the wrapped value #52421

Merged
merged 12 commits into from
May 10, 2024
Merged

Define == for Some by forwarding to the wrapped value #52421

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3211be6
Define `==` for `Some` by forwarding to the wrapped value
Seelengrab Dec 6, 2023
4b05321
Implement hashing for custom `Some` equality
Seelengrab Dec 6, 2023
c122e73
Add missing support to `Some` equality
Seelengrab Dec 7, 2023
b6fbb40
Ensure `==(::Some, ::Some{Missing})` doesn't unwrap
Seelengrab Dec 7, 2023
4db3456
Fix `Some{Missing}` ambiguity on equality
Seelengrab Dec 7, 2023
a8145d2
Remove unnecessary specialization
Seelengrab Dec 8, 2023
177625d
Make `isequal` for `Some{Missing}` type stable
Seelengrab Dec 11, 2023
28c6ecb
Try to get around a false positive in the typo checker
Seelengrab Dec 11, 2023
2b44260
Remove specialized `missing` behavior
Seelengrab Jan 2, 2024
e224a69
Remove explicit handling of `Some{Missing}`
Seelengrab Feb 27, 2024
5956ba4
Apply suggestions from code review
Seelengrab Mar 28, 2024
d7e5eee
Merge branch 'master' into some_equality
LilithHafner May 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions base/some.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,3 +145,12 @@
something = GlobalRef(Base, :something)
return :($something($expr))
end

Seelengrab marked this conversation as resolved.
Show resolved Hide resolved
==(a::Some, b::Some)::Bool = a.value == b.value
# seperated out to ensure the above assertion works

Check warning on line 150 in base/some.jl

View workflow job for this annotation

GitHub Actions / Check for new typos 

perhaps "seperated" should be "separated".
==(::Some{Missing}, ::Some) = missing
==(::Some, ::Some{Missing}) = missing
==(::Some{Missing}, ::Some{Missing}) = missing

Seelengrab marked this conversation as resolved.
Show resolved Hide resolved
isequal(a::Some, b::Some)::Bool = isequal(a.value, b.value)
hash(s::Some, h::UInt) = hash(s.value, hash(Some, h))
Seelengrab marked this conversation as resolved.
Show resolved Hide resolved
25 changes: 25 additions & 0 deletions test/some.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,31 @@
@test !isequal(Some(1), nothing)
@test !isequal(Some(nothing), nothing)

# Some with something else is false
@test !=(Some(nothing), nothing)
@test !=(nothing, Some(nothing))

# Two `Some`s forward to their wrapped things
@test ==(Some([0x1]), Some([1]))

# propagate wrapped missings

Check warning on line 59 in test/some.jl

View workflow job for this annotation

GitHub Actions / Check for new typos 

perhaps "missings" should be "missing".
@test !=(Some(1), Some(missing)) isa Missing
@test !=(Some(missing), Some(1)) isa Missing
@test ==(Some(missing), Some(missing)) isa Missing

# Make sure to still propagate non-wrapped Missing
@test ==(Some(1), missing) isa Missing
@test ==(missing, Some(1)) isa Missing

@test isequal(Some([0x1]), Some([1]))
@test !isequal(missing, Some(missing))
@test !isequal(Some(missing), missing)
@test isequal(Some(missing), Some(missing))

# hashing implications
@test hash(Some(0x1)) != hash(0x1)
@test hash(Some(0x1)) == hash(Some(1))
Seelengrab marked this conversation as resolved.
Show resolved Hide resolved

@testset "something" begin
@test_throws ArgumentError something()
@test something(1) === 1
Expand Down
Loading