From e9a0959e857fb62d0cb7a45fe17e50b6be63cc37 Mon Sep 17 00:00:00 2001 From: rushabh-v Date: Mon, 11 Jan 2021 15:25:36 +0530 Subject: [PATCH] replace conj with push and update tests --- src/PersistentSet.jl | 6 ++---- test/PersistentSetTest.jl | 8 ++++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/PersistentSet.jl b/src/PersistentSet.jl index b53c1eb..819fc43 100644 --- a/src/PersistentSet.jl +++ b/src/PersistentSet.jl @@ -15,11 +15,9 @@ Base.@deprecate(PersistentSet(x1::T, x2::T, xs::T...) where {T}, Base.hash(s::PersistentSet,h::UInt) = hash(s.dict, h+(UInt(0xf7dca1a5fd7090be))) -Base.conj(s::PersistentSet{T}, val) where {T} = +push(s::PersistentSet{T}, val) where {T} = PersistentSet{T}(assoc(s.dict, val, nothing)) -push(s::PersistentSet, val) = conj(s, val) - disj(s::PersistentSet{T}, val) where {T} = PersistentSet{T}(dissoc(s.dict, val)) @@ -52,7 +50,7 @@ Base.isempty(s::PersistentSet) = length(s.dict) == 0 function _union(s::PersistentSet, xs) for x in xs - s = conj(s, x) + s = push(s, x) end s end diff --git a/test/PersistentSetTest.jl b/test/PersistentSetTest.jl index 92bce0a..c532d38 100644 --- a/test/PersistentSetTest.jl +++ b/test/PersistentSetTest.jl @@ -19,10 +19,10 @@ const PS = PersistentSet @test PS{String}() == PS{Int}() end - @testset "conj" begin - @test conj(PS([1, 2, 3]), 4) == PS([1, 2, 3, 4]) - @test conj(PS([1, 2, 3]), 1) == PS([1, 2, 3]) - @test conj(PS([1, 2, 3]), 4) == PS([4, 3, 2, 1]) + @testset "push" begin + @test push(PS([1, 2, 3]), 4) == PS([1, 2, 3, 4]) + @test push(PS([1, 2, 3]), 1) == PS([1, 2, 3]) + @test push(PS([1, 2, 3]), 4) == PS([4, 3, 2, 1]) end @testset "disj" begin