Merge pull request #891 from JuliaOpt/bl/julia-v1.3-ambiguity

Fix method ambiguity detected by Julia v1.3

Author: blegat

.travis.yml

@@ -8,6 +8,7 @@ julia:
   - 1.0
   - 1.1
   - 1.2
+  - 1.3
 notifications:
   email: false
 git:

src/Utilities/model.jl

@@ -474,11 +474,12 @@ end
 # 0xd = 0x80 | 0x40 | 0x8 | 0x4 | 0x1
 const UPPER_BOUND_MASK = 0xcd
 
+const SUPPORTED_SCALAR_SETS{T} = Union{
+    MOI.EqualTo{T}, MOI.GreaterThan{T}, MOI.LessThan{T}, MOI.Interval{T},
+    MOI.Integer, MOI.ZeroOne, MOI.Semicontinuous{T}, MOI.Semiinteger{T}}
 function MOI.supports_constraint(
     ::AbstractModel{T}, ::Type{MOI.SingleVariable},
-    ::Type{<:Union{MOI.EqualTo{T}, MOI.GreaterThan{T}, MOI.LessThan{T},
-                   MOI.Interval{T}, MOI.Integer, MOI.ZeroOne,
-                   MOI.Semicontinuous{T}, MOI.Semiinteger{T}}}) where T
+    ::Type{<:SUPPORTED_SCALAR_SETS{T}}) where T
     return true
 end
 function MOI.add_constraint(model::AbstractModel{T}, f::MOI.SingleVariable,

test/Bridges/lazy_bridge_optimizer.jl

@@ -327,8 +327,8 @@ MOIU.@model(NoVariableModel,
             (MOI.ScalarAffineFunction,),
             (),
             (MOI.VectorAffineFunction,))
-function MOI.supports_constraint(::NoVariableModel, ::Type{MOI.SingleVariable},
-                                 ::Type{<:MOI.AbstractScalarSet})
+function MOI.supports_constraint(::NoVariableModel{T}, ::Type{MOI.SingleVariable},
+                                 ::Type{<:MOIU.SUPPORTED_SCALAR_SETS{T}}) where T
     return false
 end