Updated my JuliaFormatter.

Author: corbett5

NDTensors/src/abstractarray/similar.jl

@@ -105,13 +105,13 @@ end
 
 @traitfn function similartype(
   arraytype::Type{ArrayT}, eltype::Type
-) where {ArrayT; !IsWrappedArray{ArrayT}}
+) where {ArrayT;!IsWrappedArray{ArrayT}}
   return set_eltype(arraytype, eltype)
 end
 
 @traitfn function similartype(
   arraytype::Type{ArrayT}, dims::Tuple
-) where {ArrayT; !IsWrappedArray{ArrayT}}
+) where {ArrayT;!IsWrappedArray{ArrayT}}
   return set_indstype(arraytype, dims)
 end
 
@@ -126,13 +126,13 @@ end
 ## Wrapped arrays
 @traitfn function similartype(
   arraytype::Type{ArrayT}, eltype::Type
-) where {ArrayT; IsWrappedArray{ArrayT}}
+) where {ArrayT;IsWrappedArray{ArrayT}}
   return similartype(unwrap_array_type(arraytype), eltype)
 end
 
 @traitfn function similartype(
   arraytype::Type{ArrayT}, dims::Tuple
-) where {ArrayT; IsWrappedArray{ArrayT}}
+) where {ArrayT;IsWrappedArray{ArrayT}}
   return similartype(unwrap_array_type(arraytype), dims)
 end
 

NDTensors/src/abstractarray/tensoralgebra/contract.jl

@@ -86,7 +86,7 @@ end
 
 # Non-trivial permutation
 function _contract_scalar_perm!(
-  Rᵃ::AbstractArray{ElR}, Tᵃ::AbstractArray, perm, α, β=zero(ElR)
+  Rᵃ::AbstractArray{ElR}, Tᵃ::AbstractArray, perm, α; β=zero(ElR)
 ) where {ElR}
   if iszero(β)
     if iszero(α)
@@ -116,7 +116,7 @@ function _contract!(
   CT::AbstractArray{El,NC},
   AT::AbstractArray{El,NA},
   BT::AbstractArray{El,NB},
-  props::ContractionProperties,
+  props::ContractionProperties;
   α::Number=one(El),
   β::Number=zero(El),
 ) where {El,NC,NA,NB}

NDTensors/src/backup/arraystorage/blocksparsearray/storage/combiner/contract_uncombine.jl

@@ -82,9 +82,9 @@ function uncombine(
   # This is needed for reshaping the block
   # TODO: It is already calculated in uncombine_output, use it from there
   labels_uncomb_perm = setdiff(labels_dest, labels_src)
-  ind_uncomb_perm = ⊗(
-    axes_dest[map(x -> findfirst(==(x), labels_dest), labels_uncomb_perm)]...
-  )
+  ind_uncomb_perm = ⊗(axes_dest[map(
+    x -> findfirst(==(x), labels_dest), labels_uncomb_perm
+  )]...)
   ind_uncomb = BlockArrays.blockedrange(
     length.(BlockArrays.blocks(ind_uncomb_perm)[blockperm])
   )
@@ -139,9 +139,9 @@ function uncombine_output(
   blockcomb::Vector{Int},
 )
   labels_uncomb_perm = setdiff(labels_dest, labels_src)
-  ind_uncomb_perm = ⊗(
-    axes_dest[map(x -> findfirst(==(x), labels_dest), labels_uncomb_perm)]...
-  )
+  ind_uncomb_perm = ⊗(axes_dest[map(
+    x -> findfirst(==(x), labels_dest), labels_uncomb_perm
+  )]...)
   axes_uncomb_perm = insertat(axes(a_src), ind_uncomb_perm, combdim)
   # Uncombine the blocks of a_src
   blocks_uncomb = uncombine_blocks(nzblocks(a_src), combdim, blockcomb)

NDTensors/src/backup/arraystorage/blocksparsearray/storage/combiner/contract_utils.jl

@@ -96,7 +96,7 @@ function uncombine_blocks(
     ncomb = _number_uncombined(blockval, blockcomb)
     ncomb_shift = _number_uncombined_shift(blockval, blockcomb)
     push!(blocks_uncomb, setindex(block, blockval + ncomb_shift, dim))
-    for j in 1:(ncomb - 1)
+    for j in 1:(ncomb-1)
       push!(blocks_uncomb, setindex(block, blockval + ncomb_shift + j, dim))
     end
   end
@@ -112,7 +112,7 @@ function uncombine_block(
   ncomb = _number_uncombined(blockval, blockcomb)
   ncomb_shift = _number_uncombined_shift(blockval, blockcomb)
   push!(blocks_uncomb, setindex(block, blockval + ncomb_shift, dim))
-  for j in 1:(ncomb - 1)
+  for j in 1:(ncomb-1)
     push!(blocks_uncomb, setindex(block, blockval + ncomb_shift + j, dim))
   end
   return blocks_uncomb

NDTensors/src/blocksparse/block.jl

@@ -68,7 +68,7 @@ convert(::Type{Block{N}}, t::Tuple) where {N} = Block{N}(t)
 
 gethash(b::Block) = b.hash[]
 
-sethash!(b::Block, h::UInt) = (b.hash[] = h; return b)
+sethash!(b::Block, h::UInt) = (b.hash[]=h; return b)
 
 #
 # Basic functions
@@ -114,7 +114,7 @@ checkbounds(::Tensor, ::Block) = nothing
 _hash(t::Tuple) = _hash(t, zero(UInt))
 _hash(::Tuple{}, h::UInt) = h + Base.tuplehash_seed
 @generated function _hash(b::NTuple{N}, h::UInt) where {N}
-  quote
+  return quote
     out = h + Base.tuplehash_seed
     @nexprs $N i -> out = hash(b[$N - i + 1], out)
   end

NDTensors/src/blocksparse/blocksparsetensor.jl

@@ -614,7 +614,7 @@ function _number_uncombined_shift(blockval::Integer, blockcomb::Vector)
     return 0
   end
   ncomb_shift = 0
-  for i in 1:(blockval - 1)
+  for i in 1:(blockval-1)
     ncomb_shift += findfirst(==(i + 1), blockcomb) - findfirst(==(i), blockcomb) - 1
   end
   return ncomb_shift
@@ -633,7 +633,7 @@ function uncombine_blocks(blocks::Blocks{N}, dim::Int, blockcomb::Vector{Int}) w
     ncomb = _number_uncombined(blockval, blockcomb)
     ncomb_shift = _number_uncombined_shift(blockval, blockcomb)
     push!(blocks_uncomb, setindex(block, blockval + ncomb_shift, dim))
-    for j in 1:(ncomb - 1)
+    for j in 1:(ncomb-1)
       push!(blocks_uncomb, setindex(block, blockval + ncomb_shift + j, dim))
     end
   end
@@ -647,7 +647,7 @@ function uncombine_block(block::Block{N}, dim::Int, blockcomb::Vector{Int}) wher
   ncomb = _number_uncombined(blockval, blockcomb)
   ncomb_shift = _number_uncombined_shift(blockval, blockcomb)
   push!(blocks_uncomb, setindex(block, blockval + ncomb_shift, dim))
-  for j in 1:(ncomb - 1)
+  for j in 1:(ncomb-1)
     push!(blocks_uncomb, setindex(block, blockval + ncomb_shift + j, dim))
   end
   return blocks_uncomb
@@ -760,7 +760,7 @@ end
 function permutedims!!(
   R::BlockSparseTensor{ElR,N},
   T::BlockSparseTensor{ElT,N},
-  perm::NTuple{N,Int},
+  perm::NTuple{N,Int};
   f::Function=(r, t) -> t,
 ) where {ElR,ElT,N}
   RR = convert(promote_type(typeof(R), typeof(T)), R)
@@ -773,7 +773,7 @@ scale_blocks!(T, compute_fac::Function=(b) -> 1) = T
 
 # <fermions>
 function scale_blocks!(
-  T::BlockSparseTensor{<:Number,N}, compute_fac::Function=(b) -> 1
+  T::BlockSparseTensor{<:Number,N}; compute_fac::Function=(b) -> 1
 ) where {N}
   for blockT in keys(blockoffsets(T))
     fac = compute_fac(blockT)
@@ -792,7 +792,7 @@ using .TypeParameterAccessors: set_type_parameters, parenttype
 function permutedims!(
   R::BlockSparseTensor{<:Number,N},
   T::BlockSparseTensor{<:Number,N},
-  perm::NTuple{N,Int},
+  perm::NTuple{N,Int};
   f::Function=(r, t) -> t,
 ) where {N}
   blocks_R = keys(blockoffsets(R))

NDTensors/src/blocksparse/contract_threads.jl

@@ -74,14 +74,14 @@ function contract!(
   ncontracted = 1
   posR = last(contraction_plan[1])
   posR_unique = posR
-  for n in 1:(nnzblocks(R) - 1)
+  for n in 1:(nnzblocks(R)-1)
     start = ncontracted
     while posR == posR_unique
       ncontracted += 1
       posR = last(contraction_plan[ncontracted])
     end
     posR_unique = posR
-    repeats[n] = start:(ncontracted - 1)
+    repeats[n] = start:(ncontracted-1)
   end
   repeats[end] = ncontracted:length(contraction_plan)
 

NDTensors/src/blocksparse/diagblocksparse.jl

@@ -504,7 +504,7 @@ end
 function permutedims!(
   R::DiagBlockSparseTensor{<:Number,N},
   T::DiagBlockSparseTensor{<:Number,N},
-  perm::NTuple{N,Int},
+  perm::NTuple{N,Int};
   f::Function=(r, t) -> t,
 ) where {N}
   # TODO: check that inds(R)==permute(inds(T),perm)?
@@ -515,7 +515,7 @@ function permutedims!(
 end
 
 function permutedims(
-  T::UniformDiagBlockSparseTensor{ElT,N}, perm::NTuple{N,Int}, f::Function=identity
+  T::UniformDiagBlockSparseTensor{ElT,N}, perm::NTuple{N,Int}; f::Function=identity
 ) where {ElT,N}
   R = tensor(DiagBlockSparse(f(getdiagindex(T, 1))), permute(inds(T), perm))
   return R
@@ -525,7 +525,7 @@ end
 function permutedims!!(
   R::NonuniformDiagBlockSparseTensor{<:Number,N},
   T::NonuniformDiagBlockSparseTensor{<:Number,N},
-  perm::NTuple{N,Int},
+  perm::NTuple{N,Int};
   f::Function=(r, t) -> t,
 ) where {N}
   RR = convert(promote_type(typeof(R), typeof(T)), R)
@@ -536,7 +536,7 @@ end
 function permutedims!!(
   R::UniformDiagBlockSparseTensor{ElR,N},
   T::UniformDiagBlockSparseTensor{ElT,N},
-  perm::NTuple{N,Int},
+  perm::NTuple{N,Int};
   f::Function=(r, t) -> t,
 ) where {ElR,ElT,N}
   RR = convert(promote_type(typeof(R), typeof(T)), R)
@@ -547,7 +547,7 @@ end
 function permutedims!(
   R::DenseTensor{ElR,N},
   T::DiagBlockSparseTensor{ElT,N},
-  perm::NTuple{N,Int},
+  perm::NTuple{N,Int};
   f::Function=(r, t) -> t,
 ) where {ElR,ElT,N}
   for i in 1:diaglength(T)
@@ -559,7 +559,7 @@ end
 function permutedims!!(
   R::DenseTensor{ElR,N},
   T::DiagBlockSparseTensor{ElT,N},
-  perm::NTuple{N,Int},
+  perm::NTuple{N,Int};
   f::Function=(r, t) -> t,
 ) where {ElR,ElT,N}
   permutedims!(R, T, perm, f)

NDTensors/src/dense/densetensor.jl

@@ -129,7 +129,7 @@ end
 @propagate_inbounds @inline getindex(T::DenseTensor, i::Integer) = storage(T)[i]
 
 @propagate_inbounds @inline function setindex!(T::DenseTensor, v, i::Integer)
-  return (storage(T)[i] = v; T)
+  return (storage(T)[i]=v; T)
 end
 
 #
@@ -235,7 +235,7 @@ end
 
 function apply!(
   R::DenseTensor{<:Number,N,StoreT},
-  T::DenseTensor{<:Number,N,StoreT},
+  T::DenseTensor{<:Number,N,StoreT};
   f::Function=(r, t) -> t,
 ) where {N,StoreT<:StridedArray}
   RA = array(R)

NDTensors/src/dense/tensoralgebra/contract.jl

@@ -10,7 +10,7 @@ function _contract_scalar!(
   T1::Number,
   labelsT1,
   T2::Number,
-  labelsT2,
+  labelsT2;
   α=one(ElR),
   β=zero(ElR),
 ) where {ElR}
@@ -28,7 +28,7 @@ end
 # Version where R and T have different element types, so we can't call BLAS
 # Instead use Julia's broadcasting (maybe consider Strided in the future)
 function _contract_scalar_noperm!(
-  R::DenseTensor{ElR}, T::DenseTensor, α, β=zero(ElR)
+  R::DenseTensor{ElR}, T::DenseTensor, α; β=zero(ElR)
 ) where {ElR}
   Rᵈ = data(R)
   Tᵈ = data(T)
@@ -60,7 +60,7 @@ end
 # Version where R and T are the same element type, so we can
 # call BLAS
 function _contract_scalar_noperm!(
-  R::DenseTensor{ElR}, T::DenseTensor{ElR}, α, β=zero(ElR)
+  R::DenseTensor{ElR}, T::DenseTensor{ElR}, α; β=zero(ElR)
 ) where {ElR}
   Rᵈ = data(R)
   Tᵈ = data(T)
@@ -90,7 +90,7 @@ function _contract_scalar_noperm!(
 end
 
 function _contract_scalar_maybe_perm!(
-  ::Order{N}, R::DenseTensor{ElR,NR}, labelsR, T::DenseTensor, labelsT, α, β=zero(ElR)
+  ::Order{N}, R::DenseTensor{ElR,NR}, labelsR, T::DenseTensor, labelsT, α; β=zero(ElR)
 ) where {ElR,NR,N}
   labelsRᵣ, dimsRᵣ = drop_singletons(Order(N), labelsR, dims(R))
   labelsTᵣ, dimsTᵣ = drop_singletons(Order(N), labelsT, dims(T))
@@ -108,7 +108,7 @@ function _contract_scalar_maybe_perm!(
 end
 
 function _contract_scalar_maybe_perm!(
-  R::DenseTensor{ElR,NR}, labelsR, T::DenseTensor, labelsT, α, β=zero(ElR)
+  R::DenseTensor{ElR,NR}, labelsR, T::DenseTensor, labelsT, α; β=zero(ElR)
 ) where {ElR,NR}
   N = count(≠(1), dims(R))
   _contract_scalar_maybe_perm!(Order(N), R, labelsR, T, labelsT, α, β)
@@ -122,7 +122,7 @@ function _contract_scalar_maybe_perm!(
   T₁::DenseTensor,
   labelsT₁,
   T₂::DenseTensor,
-  labelsT₂,
+  labelsT₂;
   α=one(ElR),
   β=zero(ElR),
 ) where {ElR,NR}
@@ -143,7 +143,7 @@ function _contract_scalar!(
   T1::DenseTensor,
   labelsT1,
   T2::DenseTensor,
-  labelsT2,
+  labelsT2;
   α=one(ElR),
   β=zero(ElR),
 ) where {ElR}
@@ -161,7 +161,7 @@ function contract!(
   T1::DenseTensor{ElT1,N1},
   labelsT1,
   T2::DenseTensor{ElT2,N2},
-  labelsT2,
+  labelsT2;
   α::Elα=one(ElR),
   β::Elβ=zero(ElR),
 ) where {Elα,Elβ,ElR,ElT1,ElT2,NR,N1,N2}
@@ -217,7 +217,7 @@ function _contract!(
   CT::DenseTensor{El,NC},
   AT::DenseTensor{El,NA},
   BT::DenseTensor{El,NB},
-  props::ContractionProperties,
+  props::ContractionProperties;
   α::Number=one(El),
   β::Number=zero(El),
 ) where {El,NC,NA,NB}