Skip to content

Commit

Permalink
Updates for latest Julia 0.7 (#67)
Browse files Browse the repository at this point in the history
* Use `something` instead of `coalesce`

`coalesce` is now for `missing` only rather than for both `missing` and
`nothing`, and `something` provides the equivalent functionality for
`nothing`.

Fixes #66.

* Add 0.7 testing to the CI setup
  • Loading branch information
ararslan authored and bicycle1885 committed Jul 2, 2018
1 parent afda862 commit cd63461
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 2 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ os:
- osx
julia:
- 0.6
- 0.7
- nightly
matrix:
allow_failures:
Expand Down
2 changes: 1 addition & 1 deletion REQUIRE
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
julia 0.6
BinaryProvider 0.3
Compat 0.62
Compat 0.67
2 changes: 2 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ environment:
matrix:
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe"
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.7/julia-0.7-latest-win32.exe"
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.7/julia-0.7-latest-win64.exe"
- JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"
- JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"

Expand Down
2 changes: 1 addition & 1 deletion src/node.jl
Original file line number Diff line number Diff line change
Expand Up @@ -1221,7 +1221,7 @@ end

function findfirstchar(char::Char, str::AbstractString)
@static if VERSION > v"0.7-"
return coalesce(findfirst(isequal(char), str), 0)
return something(findfirst(isequal(char), str), 0)
else
return searchindex(str, char)
end
Expand Down

0 comments on commit cd63461

Please sign in to comment.