Skip to content

Commit 2ce10e5

Browse files
committed
some improvements, update CI
1 parent 667dd2f commit 2ce10e5

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ os:
66
- osx
77
julia:
88
- 1.0
9-
- 1.2
10-
- 1.3
9+
- 1
1110
- nightly
1211

1312
notifications:

appveyor.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
environment:
22
matrix:
33
- julia_version: 1.0
4-
- julia_version: 1.2
5-
- julia_version: 1.3
4+
- julia_version: 1
65
- julia_version: nightly
76

87
platform:

src/TupleTools.jl

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -240,8 +240,9 @@ function _merge(t1::Tuple, t2::Tuple, lt, by, rev)
240240
return (first(t2), _merge(t1, tail(t2), lt, by, rev)...)
241241
end
242242
end
243-
_merge(t1::Tuple{}, t2::Tuple, lt, by, rev) = t2
244-
_merge(t1::Tuple, t2::Tuple{}, lt, by, rev) = t1
243+
_merge(::Tuple{}, t2::Tuple, lt, by, rev) = t2
244+
_merge(t1::Tuple, ::Tuple{}, lt, by, rev) = t1
245+
_merge(::Tuple{}, ::Tuple{}, lt, by, rev) = ()
245246

246247

247248
"""
@@ -252,7 +253,7 @@ Computes a tuple that contains the permutation required to sort `t`.
252253
"""
253254
sortperm(t::Tuple; lt=isless, by=identity, rev::Bool=false) = _sortperm(t, lt, by, rev)
254255
function _sortperm(t::Tuple, lt=isless, by=identity, rev::Bool=false)
255-
_sort(ntuple(identity, length(t)), lt, i->by(getindex(t, i)), rev)
256+
map(first, _sort(ntuple(n->(n,by(t[n])), length(t)), lt, last, rev))
256257
end
257258

258259
"""

0 commit comments

Comments
 (0)