More updates

src/Benchmarks/Benchmarks.jl

@@ -222,7 +222,7 @@ end
     x = MOI.add_variables(model, 10_000)
     MOI.add_constraints(
         model,
-        [
+        MOI.ScalarAffineFunction{Float64}[
             MOI.ScalarAffineFunction([MOI.ScalarAffineTerm(1.0, xi)], 0.0) for
             xi in x
         ],

src/Bridges/Constraint/bridges/all_different.jl

@@ -165,7 +165,7 @@ function MOI.get(
     if bridge.y === nothing
         return MOI.VariableIndex[]
     end
-    return [bridge.y]
+    return MOI.VariableIndex[something(bridge.y)]
 end
 
 function MOI.get(
@@ -182,11 +182,12 @@ function MOI.get(
     bridge::AllDifferentToCountDistinctBridge{T},
     ::MOI.ListOfConstraintIndices{MOI.VariableIndex,MOI.EqualTo{T}},
 ) where {T}
-    if bridge.y === nothing
-        return MOI.ConstraintIndex{MOI.VariableIndex,MOI.EqualTo{T}}[]
+    F, S = MOI.VariableIndex, MOI.EqualTo{T}
+    ret = MOI.ConstraintIndex{F,S}[]
+    if bridge.y !== nothing
+        push!(ret, MOI.ConstraintIndex{F,S}(something(bridge.y).value))
     end
-    ci = MOI.ConstraintIndex{MOI.VariableIndex,MOI.EqualTo{T}}(bridge.y.value)
-    return [ci]
+    return ret
 end
 
 function MOI.get(

src/FileFormats/LP/LP.jl

@@ -640,7 +640,7 @@ function _parse_section(
 )
     if occursin(":", line)  # Strip name of the objective
         m = match(r"(.*?)\:(.*)", line)::RegexMatch
-        line = String(m[2])
+        line = String(m[2]::AbstractString)
     end
     if occursin("^", line)
         line = replace(line, "^" => " ^ ")
@@ -677,8 +677,8 @@ function _parse_section(
     if isempty(cache.constraint_name)
         if occursin(":", line)
             m = match(r"(.*?)\:(.*)", line)::RegexMatch
-            cache.constraint_name = String(m[1])
-            line = String(m[2])
+            cache.constraint_name = String(m[1]::AbstractString)
+            line = String(m[2]::AbstractString)
         else
             # Give it a temporary name for now
             cache.constraint_name = "R$(cache.num_constraints)"
@@ -932,7 +932,7 @@ end
 function _strip_comment(line::String)
     if occursin("\\", line)
         m = match(r"(.*?)\\(.*)", line)::RegexMatch
-        return strip(String(m[1]))
+        return strip(String(m[1]::AbstractString))
     else
         return strip(line)
     end
@@ -1011,7 +1011,7 @@ function _readline(io::IO, line::AbstractString)
         return _readline(io, line)
     elseif any(Base.Fix1(endswith, line), ('+', '-', '[', '='))
         # If the line ends with a continuation character, read in the next line.
-        return _readline(io, string(line, ' ', peeked_line))
+        return _readline(io, string(line, " ", peeked_line))
     elseif any(Base.Fix1(startswith, peeked_line), (']', '/'))
         # Always read in the next line if it starts with ] or /, which are used
         # in quadratic functions.

src/Nonlinear/ReverseAD/reverse_mode.jl

@@ -314,7 +314,7 @@ end
     _extract_reverse_pass(
         g::AbstractVector{T},
         d::NLPEvaluator,
-        f::Union{_FunctionStorage,_SubexpressionStorage},
+        f::_FunctionStorage,
     ) where {T}
 
 Fill the gradient vector `g` with the values from the reverse pass. Assumes you
@@ -323,7 +323,7 @@ have already called `_reverse_eval_all(d, x)`.
 function _extract_reverse_pass(
     g::AbstractVector{T},
     d::NLPEvaluator,
-    f::Union{_FunctionStorage,_SubexpressionStorage},
+    f::_FunctionStorage,
 ) where {T}
     for i in f.dependent_subexpressions
         d.subexpression_reverse_values[i] = 0.0

src/Utilities/parser.jl

@@ -370,8 +370,11 @@ Do not name `VariableIndex` constraints.
  * `x^2` does NOT currently parse. Instead, write `x * x`.
 """
 function loadfromstring!(model, s)
-    parsedlines = filter(ex -> ex !== nothing, Meta.parse.(split(s, "\n")))
-    for line in parsedlines
+    for string_line in split(s, "\n")
+        line = Meta.parse(string_line)
+        if line === nothing
+            continue
+        end
         label, ex = _separate_label(line)
         T, label = _split_type(label)
         if label == :variables