fixup Pkg3 broadcasting over iterables

JuliaLang · Mar 21, 2018 · e17a2a2 · e17a2a2 · mbauman · Mar 22, 2018
1 parent 7674aca
commit e17a2a2
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/stdlib/Pkg3/src/Operations.jl b/stdlib/Pkg3/src/Operations.jl
@@ -657,7 +657,7 @@ function with_dependencies_loadable_at_toplevel(f, mainctx::Context, pkg::Packag
     need_to_resolve = false
 
     if Types.is_project(localctx.env, pkg)
-        delete!.(localctx.env.project, ["name", "uuid", "version"])
+        foreach(k->delete!(localctx.env.project, k), ("name", "uuid", "version"))
         localctx.env.project["deps"][pkg.name] = string(pkg.uuid)
         localctx.env.manifest[pkg.name] = [Dict(
             "deps" => mainctx.env.project["deps"],

diff --git a/stdlib/Pkg3/src/Types.jl b/stdlib/Pkg3/src/Types.jl
@@ -482,7 +482,7 @@ mutable struct EnvCache
         git = ispath(joinpath(project_dir, ".git")) ? LibGit2.GitRepo(project_dir) : nothing
 
         project = read_project(project_file)
-        if any(haskey.(project, ["name", "uuid", "version"]))
+        if any(k->haskey(project, k), ("name", "uuid", "version"))
             project_package = PackageSpec(
                 get(project, "name", ""),
                 UUID(get(project, "uuid", 0)),

diff --git a/stdlib/Pkg3/src/resolve/FieldValues.jl b/stdlib/Pkg3/src/resolve/FieldValues.jl
@@ -105,4 +105,7 @@ function secondmax(f::Field, msk::BitVector = trues(length(f)))
     return m2 - m
 end
 
+# Support broadcasting like a scalar by default
+Base.Broadcast.broadcastable(a::FieldValue) = Ref(a)
+
 end