Skip to content

Avoid overriding function in Base since v1.2 #3

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

Merged
merged 5 commits into from
Aug 2, 2019
Merged

Avoid overriding function in Base since v1.2 #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
16eea5e
Use curried comparions from Base Julia in v1.2+
nickrobinson251 Jul 26, 2019
9f707b0
Enable CI on Julia 1.1 and 1.2
nickrobinson251 Jul 26, 2019
a07eee1
Wrap all tests in a testset
nickrobinson251 Jul 26, 2019
c4ae268
Use exact Julia version in check
nickrobinson251 Jul 30, 2019
45919ea
Ignore Manifest.toml file
nickrobinson251 Jul 30, 2019
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/Manifest.toml
2 changes: 2 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@ os:
- osx
julia:
- 1.0
- 1.1
- 1.2
- nightly
notifications:
email: false
Expand Down
13 changes: 8 additions & 5 deletions src/predicates.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,11 @@ Base.isless(x) = Fix2(isless, x)
islessequal(x) = Fix2(islessequal, x)
isgreater(x) = Fix2(isgreater, x)
isgreaterequal(x) = Fix2(isgreaterequal, x)
Base.:(<)(x) = Fix2(<, x)
Base.:(<=)(x) = Fix2(<=, x)
Base.:(>)(x) = Fix2(>, x)
Base.:(>=)(x) = Fix2(>=, x)
Base.:(!=)(x) = Fix2(!=, x)
if VERSION < v"1.2.0-DEV.257"
# Added to Base in https://github.com/JuliaLang/julia/pull/30915
Base.:(<)(x) = Fix2(<, x)
Base.:(<=)(x) = Fix2(<=, x)
Base.:(>)(x) = Fix2(>, x)
Base.:(>=)(x) = Fix2(>=, x)
Base.:(!=)(x) = Fix2(!=, x)
end
16 changes: 9 additions & 7 deletions test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@ using SplitApplyCombine

@test isempty(detect_ambiguities(Base, AcceleratedArrays))

include("Interval.jl")
include("MaybeVector.jl")
include("SingleVector.jl")
@testset "AcceleratedArrays" begin
include("Interval.jl")
include("MaybeVector.jl")
include("SingleVector.jl")

include("HashIndex.jl")
include("UniqueHashIndex.jl")
include("SortIndex.jl")
include("UniqueSortIndex.jl")
include("HashIndex.jl")
include("UniqueHashIndex.jl")
include("SortIndex.jl")
include("UniqueSortIndex.jl")
end