fixing and simplifying uses of Const and Identity constructors

Author: schlichtanders

Changelog.md

@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+
+### Fixed
+- `Option(3)` works now
+- The constructors `Const{ElementType}(value)` and `Identity{ElementType}(value)` had been removed already, however were still used. Maybe this now gave errors because of newer julia version, don't know, but now everything uses `Const(value)` and `Identity(value)` instead.
 ## [1.0.0] - 2020-07-19
 ### Added
 - CI via GitHubActions

src/Const.jl

@@ -38,7 +38,7 @@ Iterators.flatten(c::Const) = c
 Base.eltype(::Type{<:Const}) = Any
 
 Base.convert(::Type{Const{T}}, x::Const{T}) where {T} = x
-Base.convert(::Type{Const{T}}, x::Const) where {T} = Const{T}(convert(T, x.value))
+Base.convert(::Type{Const{T}}, x::Const) where {T} = Const(convert(T, x.value))
 
 # Const is covariate
 # promote_rule only works on concrete types, more general checks Type{<:Const} may overwrite

src/Identity.jl

@@ -42,7 +42,7 @@ Base.map(f, a::Identity) = Identity(f(a.value))
 Base.Iterators.flatten(a::Identity) = convert(Identity, a.value)
 
 Base.convert(::Type{Identity{T}}, x::Identity{T}) where {T} = x
-Base.convert(::Type{Identity{T}}, x::Identity) where {T} = Identity{T}(convert(T, x.value))
+Base.convert(::Type{Identity{T}}, x::Identity) where {T} = Identity(convert(T, x.value))
 
 # Identity is covariate
 # promote_rule only works on concrete types, more general checks Type{<:Const} may overwrite

src/Option.jl

@@ -15,11 +15,8 @@ We reuse [`Identity`](@ref) as representing the single-element-container and `Co
 """
 const Option{T} = Union{Const{Nothing}, Identity{T}}
 
-Option{T}(::Nothing) where T = Const(nothing)
-Option{T}(a::T) where T = Identity{T}(a)
 Option(::Nothing) = Const(nothing)
-Option(a::T) where T = Identity{T}(a)
-Option{T}() where T = Const(nothing)
+Option(a) = Identity(a)
 Option() = Const(nothing)
 
 

test/Const.jl

@@ -23,8 +23,8 @@ end) == ""
 
 @test Iterators.flatten(Const(5)) == Const(5)
 
-@test convert(Const{Float32}, Const(1)) == Const{Float32}(Float32(1))
-@test convert(Const{Number}, Const(1)) == Const{Number}(1)
+@test convert(Const{Float32}, Const(1)) == Const(Float32(1))
+@test convert(Const{Number}, Const(1)) == Const(1)
 
 @test promote_type(Const{Int}, Const{Number}) == Const{Number}
 @test promote_type(Const{Int}, Const{String}) == Const

test/Identity.jl

@@ -29,8 +29,8 @@ end == Identity(3 + 4)
   print(5)
 end) == "5"
 
-@test convert(Identity{Float32}, Identity(1)) == Identity{Float32}(Float32(1))
-@test convert(Identity{Number}, Identity(1)) == Identity{Number}(1)
+@test convert(Identity{Float32}, Identity(1)) == Identity(Float32(1))
+@test convert(Identity{Number}, Identity(1)) == Identity(1)
 
 @test promote_type(Identity{Int}, Identity{Number}) == Identity{Number}
 @test promote_type(Identity{Int}, Identity{String}) == Identity