Skip to content

Commit 6de3fba

Browse files
committed
Merge pull request #155 from JuliaLang/yyc/fs-compat
Compat for Filesystem clean up
2 parents ab43b41 + 89b2949 commit 6de3fba

File tree

4 files changed

+15
-0
lines changed

4 files changed

+15
-0
lines changed

README.md

+4
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,10 @@ Currently, the `@compat` macro supports the following syntaxes:
143143

144144
* `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)
145145

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

148152
* [`Nullable` types](http://julia.readthedocs.org/en/latest/manual/types/?highlight=nullable#nullable-types-representing-missing-values) and their associated operations.

appveyor.yml

+2
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@ environment:
22
matrix:
33
- JULIAVERSION: "julialang/bin/winnt/x86/0.3/julia-0.3-latest-win32.exe"
44
- JULIAVERSION: "julialang/bin/winnt/x64/0.3/julia-0.3-latest-win64.exe"
5+
- JULIAVERSION: "julialang/bin/winnt/x86/0.4/julia-0.4-latest-win32.exe"
6+
- JULIAVERSION: "julialang/bin/winnt/x64/0.4/julia-0.4-latest-win64.exe"
57
- JULIAVERSION: "julianightlies/bin/winnt/x86/julia-latest-win32.exe"
68
- JULIAVERSION: "julianightlies/bin/winnt/x64/julia-latest-win64.exe"
79

src/Compat.jl

+6
Original file line numberDiff line numberDiff line change
@@ -706,4 +706,10 @@ if VERSION < v"0.5.0-dev+763"
706706
const SparseArrays = Base.SparseMatrix
707707
end
708708

709+
if VERSION < v"0.5.0-dev+1229"
710+
const Filesystem = Base.FS
711+
else
712+
import Base.Filesystem
713+
end
714+
709715
end # module

test/runtests.jl

+3
Original file line numberDiff line numberDiff line change
@@ -545,3 +545,6 @@ Base.remote_do(() -> true, 1) # Doesn't return anything so cannot be `@test`ed b
545545

546546
# JuliaLang/julia#13440
547547
@test isa(SparseArrays, Module)
548+
549+
# JuliaLang/julia#12819
550+
@test Compat.Filesystem.JL_O_RDWR == Compat.Filesystem.JL_O_RDWR

0 commit comments

Comments
 (0)