Skip to content

Commit

Permalink
Merge pull request #155 from JuliaLang/yyc/fs-compat
Browse files Browse the repository at this point in the history
Compat for Filesystem clean up
  • Loading branch information
yuyichao committed Nov 16, 2015
2 parents ab43b41 + 89b2949 commit 6de3fba
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 0 deletions.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,10 @@ Currently, the `@compat` macro supports the following syntaxes:

* `remotecall`, `remotecall_fetch`, `remotecall_wait`, and `remote_do` have the function to be executed remotely as the first argument in Julia 0.5. Loading `Compat` defines the same methods in older versions of Julia. [#13338](https://github.com/JuliaLang/julia/pull/13338)

* `Base.FS` is now `Base.Filesystem` [#12819](https://github.com/JuliaLang/julia/pull/12819).
Compat provides an unexported `Compat.Filesystem` method that is aliased to
`Base.FS` on Julia 0.3 and 0.4 and `Base.Filesystem` on Julia 0.5.

## New types

* [`Nullable` types](http://julia.readthedocs.org/en/latest/manual/types/?highlight=nullable#nullable-types-representing-missing-values) and their associated operations.
Expand Down
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:
- JULIAVERSION: "julialang/bin/winnt/x86/0.3/julia-0.3-latest-win32.exe"
- JULIAVERSION: "julialang/bin/winnt/x64/0.3/julia-0.3-latest-win64.exe"
- JULIAVERSION: "julialang/bin/winnt/x86/0.4/julia-0.4-latest-win32.exe"
- JULIAVERSION: "julialang/bin/winnt/x64/0.4/julia-0.4-latest-win64.exe"
- JULIAVERSION: "julianightlies/bin/winnt/x86/julia-latest-win32.exe"
- JULIAVERSION: "julianightlies/bin/winnt/x64/julia-latest-win64.exe"

Expand Down
6 changes: 6 additions & 0 deletions src/Compat.jl
Original file line number Diff line number Diff line change
Expand Up @@ -706,4 +706,10 @@ if VERSION < v"0.5.0-dev+763"
const SparseArrays = Base.SparseMatrix
end

if VERSION < v"0.5.0-dev+1229"
const Filesystem = Base.FS
else
import Base.Filesystem
end

end # module
3 changes: 3 additions & 0 deletions test/runtests.jl
Original file line number Diff line number Diff line change
Expand Up @@ -545,3 +545,6 @@ Base.remote_do(() -> true, 1) # Doesn't return anything so cannot be `@test`ed b

# JuliaLang/julia#13440
@test isa(SparseArrays, Module)

# JuliaLang/julia#12819
@test Compat.Filesystem.JL_O_RDWR == Compat.Filesystem.JL_O_RDWR

0 comments on commit 6de3fba

Please sign in to comment.