Skip to content

Commit

Permalink
Consistent nothing
Browse files Browse the repository at this point in the history
  • Loading branch information
musm committed Jan 28, 2017
1 parent 142681e commit ac113e6
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion src/debug.jl
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ function show(io::IO, deps::LibraryGroup)
print(io," - Library Group \"$(deps.name)\"")
all = allf(deps)
providers = satisfied_providers(deps,all)
if providers != nothing && !(isempty(providers))
if providers !== nothing && !isempty(providers)
print(io," (satisfied by ",join(providers,", "),")")
end
if !applicable(deps)
Expand Down
10 changes: 5 additions & 5 deletions src/dependencies.jl
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@ function available_versions(p::AptGet)
vs = l[(1+length("Version: ")):end]
push!(vers, vs)
end
elseif lookfor_version && (m = match(DEBIAN_VERSION_REGEX, l)) != nothing
m.captures[2] != nothing ? push!(vers, m.captures[2]) :
elseif lookfor_version && (m = match(DEBIAN_VERSION_REGEX, l)) !== nothing
m.captures[2] !== nothing ? push!(vers, m.captures[2]) :
push!(vers, m.captures[4])
elseif startswith(l, "Versions:")
lookfor_version = true
Expand Down Expand Up @@ -495,7 +495,7 @@ function _find_library(dep::LibraryDependency; provider = Any)
# Make sure we keep the defaults first, but also look in the other directories
providers = unique([reduce(vcat,[getallproviders(dep,p) for p in defaults]);dep.providers])
for (p,opts) in providers
(p != nothing && can_use(typeof(p)) && can_provide(p,opts,dep)) || continue
(p !== nothing && can_use(typeof(p)) && can_provide(p,opts,dep)) || continue
paths = AbstractString[]

# Allow user to override installation path
Expand Down Expand Up @@ -686,7 +686,7 @@ function viable_providers(deps::LibraryGroup)
continue
end
providers = map(x->typeof(x[1]),dep.providers)
if vp == nothing
if vp === nothing
vp = providers
else
vp = intersect(vp,providers)
Expand Down Expand Up @@ -1013,7 +1013,7 @@ macro load_dependencies(args...)
end
end)
end
if arg1 != nothing && !isa(arg1,Function)
if arg1 !== nothing && !isa(arg1,Function)
if !isempty(arg1)
errrormsg = "The following required libraries were not declared in build.jl:\n"
for k in (isa(arg1,Vector) ? arg1 : keys(arg1))
Expand Down

0 comments on commit ac113e6

Please sign in to comment.