Skip to content

Commit a24a031

Browse files
committed
fix a few more deprecation-related items
1 parent ebfa1d5 commit a24a031

File tree

6 files changed

+5
-21
lines changed

6 files changed

+5
-21
lines changed

base/client.jl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,6 @@ end
393393
baremodule MainInclude
394394
include(fname::AbstractString) = Main.Base.include(Main, fname)
395395
eval(x) = Core.eval(Main, x)
396-
Main.Base.@deprecate eval(m, x) Core.eval(m, x)
397396
end
398397

399398
"""

base/compiler/abstractinterpretation.jl

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66

77
const CoreNumType = Union{Int32, Int64, Float32, Float64}
88

9-
const DEPRECATED_SYM = Symbol("deprecated.jl")
10-
119
const _REF_NAME = Ref.body.name
1210

1311
#########
@@ -199,10 +197,6 @@ function abstract_call_method_with_const_args(@nospecialize(f), argtypes::Vector
199197
end
200198

201199
function abstract_call_method(method::Method, @nospecialize(sig), sparams::SimpleVector, sv::InferenceState)
202-
# TODO: remove with 0.7 deprecations
203-
if method.file === DEPRECATED_SYM && method.sig == (Tuple{Type{T},Any} where T)
204-
return Any, false, nothing
205-
end
206200
if method.name === :depwarn && isdefined(Main, :Base) && method.module === Main.Base
207201
return Any, false, nothing
208202
end

base/loading.jl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1070,7 +1070,6 @@ function evalfile(path::AbstractString, args::Vector{String}=String[])
10701070
Expr(:toplevel,
10711071
:(const ARGS = $args),
10721072
:(eval(x) = $(Expr(:core, :eval))(__anon__, x)),
1073-
:(@deprecate eval(m, x) Core.eval(m, x)),
10741073
:(include(x) = $(Expr(:top, :include))(__anon__, x)),
10751074
:(include($path))))
10761075
end

base/task.jl

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -178,8 +178,7 @@ function task_local_storage(body::Function, key, val)
178178
end
179179

180180
# NOTE: you can only wait for scheduled tasks
181-
# TODO: rename to wait for 1.0
182-
function _wait(t::Task)
181+
function wait(t::Task)
183182
if !istaskdone(t)
184183
if t.donenotify === nothing
185184
t.donenotify = Condition()
@@ -193,16 +192,14 @@ function _wait(t::Task)
193192
end
194193
end
195194

196-
_wait(not_a_task) = wait(not_a_task)
197-
198195
"""
199196
fetch(t::Task)
200197
201198
Wait for a Task to finish, then return its result value. If the task fails with an
202199
exception, the exception is propagated (re-thrown in the task that called fetch).
203200
"""
204201
function fetch(t::Task)
205-
_wait(t)
202+
wait(t)
206203
task_result(t)
207204
end
208205

@@ -213,7 +210,7 @@ function sync_end(refs)
213210
c_ex = CompositeException()
214211
for r in refs
215212
try
216-
_wait(r)
213+
wait(r)
217214
catch ex
218215
if !isa(r, Task) || (isa(r, Task) && !istaskfailed(r))
219216
rethrow(ex)

stdlib/LinearAlgebra/src/special.jl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,8 +142,7 @@ _small_enough(A::Bidiagonal) = size(A, 1) <= 1
142142
_small_enough(A::Tridiagonal) = size(A, 1) <= 2
143143
_small_enough(A::SymTridiagonal) = size(A, 1) <= 2
144144

145-
# TODO: Add Diagonal to this method when 0.7 deprecations are removed
146-
function fill!(A::Union{Bidiagonal,Tridiagonal,SymTridiagonal}, x)
145+
function fill!(A::Union{Diagonal,Bidiagonal,Tridiagonal,SymTridiagonal}, x)
147146
xT = convert(eltype(A), x)
148147
(iszero(xT) || _small_enough(A)) && return fillstored!(A, xT)
149148
throw(ArgumentError("array of type $(typeof(A)) and size $(size(A)) can

stdlib/Pkg/ext/TOML/test/runtests.jl

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,7 @@
33
using TOML
44
import TOML: linecol, whitespace, comment, newline, expect, lookup, Parser, parse
55

6-
if Base.isdeprecated(Base, :Test)
7-
using Test
8-
else
9-
using Base.Test
10-
end
6+
using Test
117

128
macro testval(s, v)
139
f = "foo = $s"

0 commit comments

Comments
 (0)