Skip to content
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

Use something instead of coalesce #384

Merged
merged 1 commit into from
May 31, 2018
+6 −2
Merged

Use something instead of coalesce #384

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
8 changes: 6 additions & 2 deletions src/base.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# This file contains code formerly part of Julia. License is MIT: https://julialang.org/license

if VERSION < v"0.7.0-DEV.5278"
const something = Base.coalesce
end

# deprecations from base/deprecated.jl
@deprecate varm(A::AbstractArray, m::AbstractArray, dims; kwargs...) varm(A, m; kwargs..., dims=dims)
@deprecate var(A::AbstractArray, dims; kwargs...) var(A; kwargs..., dims=dims)
Expand Down Expand Up @@ -164,10 +168,10 @@ The mean `mean` over the region may be provided.
var(A::AbstractArray; corrected::Bool=true, mean=nothing, dims=:) = _var(A, corrected, mean, dims)

_var(A::AbstractArray, corrected::Bool, mean, dims) =
varm(A, coalesce(mean, Base.mean(A, dims=dims)); corrected=corrected, dims=dims)
varm(A, something(mean, Base.mean(A, dims=dims)); corrected=corrected, dims=dims)

_var(A::AbstractArray, corrected::Bool, mean, ::Colon) =
real(varm(A, coalesce(mean, Base.mean(A)); corrected=corrected))
real(varm(A, something(mean, Base.mean(A)); corrected=corrected))

varm(iterable, m; corrected::Bool=true) = _var(iterable, corrected, m)

Expand Down