Skip to content

Commit 08873c4

Browse files
Sacha0timholy
authored andcommitted
Fix depwarns under 0.7, bump REQUIRE/CI to Julia 0.6, and bump REQUIRE Compat 0.28.0. (#143)
1 parent 5a68c11 commit 08873c4

File tree

5 files changed

+14
-17
lines changed

5 files changed

+14
-17
lines changed

.travis.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ os:
33
- linux
44
- osx
55
julia:
6-
- 0.5
76
- 0.6
87
- nightly
98
notifications:

REQUIRE

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
julia 0.5
2-
Compat 0.27.0
1+
julia 0.6
2+
Compat 0.28.0

appveyor.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
environment:
22
matrix:
3-
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.5/julia-0.5-latest-win32.exe"
4-
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.5/julia-0.5-latest-win64.exe"
53
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe"
64
- JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
75
- JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"

src/error_handling.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
be given the chance to recover from the error. Reports the library name and an error message:
44
LoaderError("ImageMagick", "Foo not available")
55
"""
6-
immutable LoaderError <: Exception
6+
struct LoaderError <: Exception
77
library::String
88
msg::String
99
end
@@ -15,7 +15,7 @@ Base.showerror(io::IO, e::LoaderError) = println(io, e.library, " load error: ",
1515
be given the chance to recover from the error. Reports the library name and an error message:
1616
WriterError("ImageMagick", "Foo not available")
1717
"""
18-
immutable WriterError <: Exception
18+
struct WriterError <: Exception
1919
library::String
2020
msg::String
2121
end
@@ -27,7 +27,7 @@ Base.showerror(io::IO, e::WriterError) = println(
2727
"""
2828
`NotInstalledError` should be thrown when a library is currently not installed.
2929
"""
30-
immutable NotInstalledError <: Exception
30+
struct NotInstalledError <: Exception
3131
library::Symbol
3232
message::String
3333
end
@@ -36,7 +36,7 @@ Base.showerror(io::IO, e::NotInstalledError) = println(io, e.library, " is not i
3636
"""
3737
`UnknownFormat` gets thrown when FileIO can't recognize the format of a file.
3838
"""
39-
immutable UnknownFormat{T <: Formatted} <: Exception
39+
struct UnknownFormat{T <: Formatted} <: Exception
4040
format::T
4141
end
4242
Base.showerror(io::IO, e::UnknownFormat) = println(io, e.format, " couldn't be recognized by FileIO.")

src/query.jl

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
### Format registry infrastructure
22
@compat abstract type OS end
33
@compat abstract type Unix <: OS end
4-
immutable Windows <: OS end
5-
immutable OSX <: Unix end
6-
immutable Linux <: Unix end
4+
struct Windows <: OS end
5+
struct OSX <: Unix end
6+
struct Linux <: Unix end
77

8-
immutable LOAD end
9-
immutable SAVE end
8+
struct LOAD end
9+
struct SAVE end
1010

1111
split_predicates(list) = filter(x-> x <: OS, list), filter(x-> !(x <: OS), list)
1212
applies_to_os(os::Vector) = isempty(os) || any(applies_to_os, os)
@@ -37,7 +37,7 @@ where `sym` is always a symbol. For example, a .csv file might have
3737
3838
An easy way to write `DataFormat{:CSV}` is `format"CSV"`.
3939
"""
40-
immutable DataFormat{sym} end
40+
struct DataFormat{sym} end
4141

4242
macro format_str(s)
4343
:(DataFormat{$(Expr(:quote, Symbol(s)))})
@@ -222,7 +222,7 @@ end
222222
DataFormat `fmt`. For example, `File{fmtpng}(filename)` would indicate a PNG
223223
file.
224224
"""
225-
immutable File{F<:DataFormat} <: Formatted{F}
225+
struct File{F<:DataFormat} <: Formatted{F}
226226
filename::String
227227
end
228228
File{sym}(fmt::Type{DataFormat{sym}}, filename) = File{fmt}(filename)
@@ -245,7 +245,7 @@ written in known `Format`. For example, `Stream{PNG}(io)` would
245245
indicate PNG format. If known, the optional `filename` argument can
246246
be used to improve error messages, etc.
247247
"""
248-
immutable Stream{F<:DataFormat,IOtype<:IO} <: Formatted{F}
248+
struct Stream{F<:DataFormat,IOtype<:IO} <: Formatted{F}
249249
io::IOtype
250250
filename::Nullable{String}
251251
end

0 commit comments

Comments
 (0)