Skip to content

Update JuliaFormatter v0.13.2 -> v0.15.11 #1586

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 6, 2021
Merged

Update JuliaFormatter v0.13.2 -> v0.15.11 #1586

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/format_check.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
shell: julia --color=yes {0}
run: |
using Pkg
Pkg.add(PackageSpec(name="JuliaFormatter", version="0.13.2"))
Pkg.add(PackageSpec(name="JuliaFormatter", version="0.15.11"))
using JuliaFormatter
format("src", verbose=true)
format("test", verbose=true)
Expand Down
4 changes: 2 additions & 2 deletions src/Bridges/Variable/free.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,8 +135,8 @@ function unbridged_map(
# `unbridged_map` is required to return a `MOI.ScalarAffineFunction`.
func = convert(MOI.ScalarAffineFunction{T}, vi)
n = div(length(bridge.variables), 2)
return bridge.variables[i.value] => func,
bridge.variables[n+i.value] => zero(MOI.ScalarAffineFunction{T})
return bridge.variables[i.value] =>
func, bridge.variables[n+i.value] => zero(MOI.ScalarAffineFunction{T})
end

function MOI.supports(
Expand Down
3 changes: 2 additions & 1 deletion src/FileFormats/CBF/read.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,8 @@ function Base.read!(io::IO, model::Model)
# Reverse order of indices.
MOI.VectorAffineFunction(
[
MOI.VectorAffineTerm{Float64}(4 - l, t) for l in 1:cone_dim for t in data.row_terms[row_idx+l]
MOI.VectorAffineTerm{Float64}(4 - l, t) for
l in 1:cone_dim for t in data.row_terms[row_idx+l]
],
data.row_constants[row_idx.+(3:-1:1)],
)
Expand Down
8 changes: 5 additions & 3 deletions test/Bridges/Constraint/interval.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,11 @@ function test_split_basic()
bridged_mock,
config,
include = [
"test_basic_$(F)_$(S)" for F in
["VariableIndex", "ScalarAffineFunction", "ScalarQuadraticFunction"]
for S in ["Interval", "EqualTo"]
"test_basic_$(F)_$(S)" for F in [
"VariableIndex",
"ScalarAffineFunction",
"ScalarQuadraticFunction",
] for S in ["Interval", "EqualTo"]
],
)
MOI.Test.runtests(
Expand Down