Skip to content

Commit 1238af0

Browse files
Sacha0jrevels
authored andcommitted
Fix depwarns under 0.7 that do not break 0.6, and bump REQUIRE and CI to >=0.6. (#64)
1 parent d96d28e commit 1238af0

File tree

9 files changed

+15
-16
lines changed

9 files changed

+15
-16
lines changed

.travis.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ os:
44
- linux
55
- osx
66
julia:
7-
- 0.4
8-
- 0.5
7+
- 0.6
98
- nightly
109
notifications:
1110
email: false

REQUIRE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
julia 0.4
1+
julia 0.6
22
Compat 0.26
33
JLD 0.6.6

appveyor.yml

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

src/execution.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ gcscrub() = (gc(); gc(); gc(); gc())
77
# Benchmark #
88
#############
99

10-
type Benchmark{id}
10+
mutable struct Benchmark{id}
1111
params::Parameters
1212
end
1313

src/groups.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# BenchmarkGroup #
33
##################
44

5-
immutable BenchmarkGroup
5+
struct BenchmarkGroup
66
tags::Vector{Any}
77
data::Dict{Any,Any}
88
end
@@ -138,7 +138,7 @@ end
138138
# tagging #
139139
#---------#
140140

141-
immutable TagFilter{P}
141+
struct TagFilter{P}
142142
predicate::P
143143
end
144144

src/parameters.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const RESOLUTION = 1000 # 1 μs = 1000 ns
55
# Parameters #
66
##############
77

8-
type Parameters
8+
mutable struct Parameters
99
seconds::Float64
1010
samples::Int
1111
evals::Int

src/serialization.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ const VERSION_KEY = "__versions__"
22

33
const VERSIONS = Dict("Julia" => string(VERSION), "BenchmarkTools" => string(BENCHMARKTOOLS_VERSION))
44

5-
type ParametersPreV006
5+
mutable struct ParametersPreV006
66
seconds::Float64
77
samples::Int
88
evals::Int
@@ -13,7 +13,7 @@ type ParametersPreV006
1313
memory_tolerance::Float64
1414
end
1515

16-
type TrialPreV006
16+
mutable struct TrialPreV006
1717
params::Parameters
1818
times::Vector{Int}
1919
gctimes::Vector{Int}

src/trials.jl

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Trial #
33
#########
44

5-
type Trial
5+
mutable struct Trial
66
params::Parameters
77
times::Vector{Float64}
88
gctimes::Vector{Float64}
@@ -86,7 +86,7 @@ trim(t::Trial, percentage = 0.1) = t[1:max(1, floor(Int, length(t) - (length(t)
8686
# TrialEstimate #
8787
#################
8888

89-
type TrialEstimate
89+
mutable struct TrialEstimate
9090
params::Parameters
9191
time::Float64
9292
gctime::Float64
@@ -133,7 +133,7 @@ params(t::TrialEstimate) = t.params
133133
# TrialRatio #
134134
##############
135135

136-
type TrialRatio
136+
mutable struct TrialRatio
137137
params::Parameters
138138
time::Float64
139139
gctime::Float64
@@ -178,7 +178,7 @@ gcratio(t::TrialEstimate) = ratio(gctime(t), time(t))
178178
# TrialJudgement #
179179
##################
180180

181-
immutable TrialJudgement
181+
struct TrialJudgement
182182
ratio::TrialRatio
183183
time::Symbol
184184
memory::Symbol

test/ExecutionTests.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ p = params(warmup(@benchmarkable sin(1)))
9898
# @benchmark #
9999
##############
100100

101-
type Foo
101+
mutable struct Foo
102102
x::Int
103103
end
104104

0 commit comments

Comments
 (0)