diff --git a/base/set.jl b/base/set.jl index afc118edb2526..00b0647122046 100644 --- a/base/set.jl +++ b/base/set.jl @@ -166,6 +166,8 @@ _unique_from(itr, out, seen, i) = unique_from(itr, out, seen, i) return out end +unique(r::AbstractRange) = allunique(r) ? r : oftype(r, r[begin:begin]) + """ unique(f, itr) @@ -393,9 +395,7 @@ end allunique(::Union{AbstractSet,AbstractDict}) = true -allunique(r::AbstractRange{T}) where {T} = (step(r) != zero(T)) || (length(r) <= 1) -allunique(r::StepRange{T,S}) where {T,S} = (step(r) != zero(S)) || (length(r) <= 1) -allunique(r::StepRangeLen{T,R,S}) where {T,R,S} = (step(r) != zero(S)) || (length(r) <= 1) +allunique(r::AbstractRange) = !iszero(step(r)) || length(r) <= 1 filter!(f, s::Set) = unsafe_filter!(f, s) diff --git a/test/sets.jl b/test/sets.jl index 3c213b5426c9d..2f08ecb210cbb 100644 --- a/test/sets.jl +++ b/test/sets.jl @@ -392,6 +392,13 @@ end @test @inferred(unique(x->x^2, Integer[3, -4, 5, 4])) == Integer[3, -4, 5] @test @inferred(unique(iseven, Integer[3, -4, 5, 4]; seen=Set{Bool}())) == Integer[3, -4] @test @inferred(unique(n -> n % 3, [5, 1, 8, 9, 3, 4, 10, 7, 2, 6])) == [5, 1, 9] + for r = (Base.OneTo(-1), Base.OneTo(0), Base.OneTo(1), Base.OneTo(5), + 1:0, 1:1, 1:2, 1:10, 1:.5:.5, 1:.5:1, 1:.5:10, 3:-2:5, 3:-2:3, 3:-2:1, + StepRangeLen(1.0, 2.0, 0), StepRangeLen(1.0, 2.0, 2), StepRangeLen(1.0, 2.0, 3), + StepRangeLen(1.0, 0.0, 0), StepRangeLen(1.0, -0.0, 1), StepRangeLen(1.0, 0.0, 2), + LinRange(1, 2, 3), LinRange(1, 1, 0), LinRange(1, 1, 1), LinRange(1, 1, 10)) + @test @inferred(unique(r)) == invoke(unique, Tuple{Any}, r) + end end @testset "issue 20105" begin @@ -458,6 +465,13 @@ end @test allunique(Date(2018, 8, 7):Day(1):Date(2018, 8, 11)) # JuliaCon 2018 @test allunique(DateTime(2018, 8, 7):Hour(1):DateTime(2018, 8, 11)) @test allunique(('a':1:'c')[1:2]) == true + for r = (Base.OneTo(-1), Base.OneTo(0), Base.OneTo(1), Base.OneTo(5), + 1:0, 1:1, 1:2, 1:10, 1:.5:.5, 1:.5:1, 1:.5:10, 3:-2:5, 3:-2:3, 3:-2:1, + StepRangeLen(1.0, 2.0, 0), StepRangeLen(1.0, 2.0, 2), StepRangeLen(1.0, 2.0, 3), + StepRangeLen(1.0, 0.0, 0), StepRangeLen(1.0, -0.0, 1), StepRangeLen(1.0, 0.0, 2), + LinRange(1, 2, 3), LinRange(1, 1, 0), LinRange(1, 1, 1), LinRange(1, 1, 10)) + @test allunique(r) == invoke(allunique, Tuple{Any}, r) + end end @testset "filter(f, ::$S)" for S = (Set, BitSet) s = S([1,2,3,4])