Skip to content

Commit

Permalink
Revert "fix sorting for iterables that define copymutable (#52086)"
Browse files Browse the repository at this point in the history
This reverts commit f99e6bf.
  • Loading branch information
KristofferC authored Nov 16, 2023
1 parent 40e56a5 commit e6603ce
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 7 deletions.
4 changes: 2 additions & 2 deletions base/sort.jl
Original file line number Diff line number Diff line change
Expand Up @@ -1501,7 +1501,7 @@ function sort(v; kws...)
size = IteratorSize(v)
size == HasShape{0}() && throw(ArgumentError("$v cannot be sorted"))
size == IsInfinite() && throw(ArgumentError("infinite iterator $v cannot be sorted"))
sort!(collect(v); kws...)
sort!(copymutable(v); kws...)
end
sort(v::AbstractVector; kws...) = sort!(copymutable(v); kws...) # for method disambiguation
sort(::AbstractString; kws...) =
Expand All @@ -1513,7 +1513,7 @@ function sort(x::NTuple{N}; lt::Function=isless, by::Function=identity,
rev::Union{Bool,Nothing}=nothing, order::Ordering=Forward) where N
o = ord(lt,by,rev,order)
if N > 9
v = sort!(collect(x), DEFAULT_STABLE, o)
v = sort!(copymutable(x), DEFAULT_STABLE, o)
tuple((v[i] for i in 1:N)...)
else
_sort(x, o)
Expand Down
5 changes: 0 additions & 5 deletions test/sorting.jl
Original file line number Diff line number Diff line change
Expand Up @@ -559,11 +559,6 @@ end

@test_throws ArgumentError sort("string")
@test_throws ArgumentError("1 cannot be sorted") sort(1)

@test sort(Set((1, 3, 6))) == [1, 3, 6]
@test sort(Dict((1=>9, 3=>2, 6=>5))) == [1=>9, 3=>2, 6=>5]
@test sort(keys(Dict((1=>2, 3=>5, 6=>9)))) == [1, 3, 6]
@test sort(values(Dict((1=>9, 3=>2, 6=>5)))) == [2, 5, 9]
end

@testset "sort!(::AbstractVector{<:Integer}) with short int range" begin
Expand Down

0 comments on commit e6603ce

Please sign in to comment.