From 2d80f680871ac2ac1646ba503684072e6fd410bc Mon Sep 17 00:00:00 2001 From: "femtocleaner[bot]" Date: Tue, 14 Aug 2018 16:46:23 +0000 Subject: [PATCH] Fix deprecations --- src/Flux.jl | 2 -- src/data/sentiment.jl | 6 +++--- src/tracker/idset.jl | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/Flux.jl b/src/Flux.jl index 0989aa9c..768e851c 100644 --- a/src/Flux.jl +++ b/src/Flux.jl @@ -1,5 +1,3 @@ -__precompile__() - module Flux # Zero Flux Given diff --git a/src/data/sentiment.jl b/src/data/sentiment.jl index a269107f..a58cd9d4 100644 --- a/src/data/sentiment.jl +++ b/src/data/sentiment.jl @@ -14,7 +14,7 @@ getfile(r, name) = r.files[findfirst(x -> x.name == name, r.files)] function getfile(name) r = ZipFile.Reader(deps("sentiment.zip")) - text = readstring(getfile(r, "trees/$name")) + text = read(getfile(r, "trees/$name"), String) close(r) return text end @@ -29,12 +29,12 @@ function parsetree(s) s = replace(s, r"\$", s -> "\\\$") s = replace(s, r"[^\s\(\)]+", s -> "\"$s\"") s = replace(s, " ", ", ") - return totree(parse(s)) + return totree(Meta.parse(s)) end function gettrees(name) load() - ss = split(getfile("$name.txt"), '\n', keep = false) + ss = split(getfile("$name.txt"), '\n', keepempty = false) return parsetree.(ss) end diff --git a/src/tracker/idset.jl b/src/tracker/idset.jl index d1c507b4..62570c99 100644 --- a/src/tracker/idset.jl +++ b/src/tracker/idset.jl @@ -11,7 +11,7 @@ Base.push!(s::IdSet{T}, x::T) where T = (s.dict[x] = nothing; s) Base.delete!(s::IdSet{T}, x::T) where T = (delete!(s.dict, x); s) Base.in(x, s::IdSet) = haskey(s.dict, x) -(::Type{IdSet{T}})(xs) where T = push!(IdSet{T}(), xs...) +IdSet{T}(xs) where T = push!(IdSet{T}(), xs...) IdSet(xs) = IdSet{eltype(xs)}(xs)