From 1b5c258e00f9bdf4a167eb2b22376ad79a8660df Mon Sep 17 00:00:00 2001 From: "Michael K. Borregaard" Date: Fri, 4 May 2018 10:43:50 +0200 Subject: [PATCH] Replace Nullable{T} with Union{T, Nothing} --- src/components.jl | 2 +- src/plot.jl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components.jl b/src/components.jl index 2b1284ce2..e7d3cc5d4 100644 --- a/src/components.jl +++ b/src/components.jl @@ -443,7 +443,7 @@ mutable struct SeriesAnnotations end function series_annotations(strs::AbstractVector, args...) fnt = font() - shp = Nullable{Any}() + shp = Union{Any, Nothing}() scalefactor = (1,1) for arg in args if isa(arg, Shape) || (isa(arg, AbstractVector) && eltype(arg) == Shape) diff --git a/src/plot.jl b/src/plot.jl index 2b7ab3895..8b9c8c44a 100644 --- a/src/plot.jl +++ b/src/plot.jl @@ -1,8 +1,8 @@ mutable struct CurrentPlot - nullableplot::Nullable{AbstractPlot} + nullableplot::Union{AbstractPlot, Nothing} end -const CURRENT_PLOT = CurrentPlot(Nullable{AbstractPlot}()) +const CURRENT_PLOT = CurrentPlot(Union{AbstractPlot, Nothing}()) isplotnull() = isnull(CURRENT_PLOT.nullableplot)