update Pkg3 precompile statements

Author: KristofferC

stdlib/Pkg3/src/API.jl

@@ -70,7 +70,7 @@ function update_registry(ctx)
         for reg in registries()
             if isdir(joinpath(reg, ".git"))
                 regpath = pathrepr(ctx, reg)
-                printpkgstyle(ctx, :Updating, "registry at ", regpath)
+                printpkgstyle(ctx, :Updating, "registry at " * regpath)
                 LibGit2.with(LibGit2.GitRepo, reg) do repo
                     if LibGit2.isdirty(repo)
                         push!(errors, (regpath, "registry dirty"))

stdlib/Pkg3/src/Display.jl

@@ -52,15 +52,15 @@ function status(ctx::Context, mode::PackageMode, use_as_api=false)
         m₁ = filter_manifest(in_project(project₁["deps"]), manifest₁)
         diff = manifest_diff(ctx, m₀, m₁)
         if !use_as_api
-            printpkgstyle(ctx, :Status, pathrepr(ctx, env.project_file); ignore_indent=true)
-            print_diff(ctx, diff; status = true)
+            printpkgstyle(ctx, :Status, pathrepr(ctx, env.project_file), #=ignore_indent=# true)
+            print_diff(ctx, diff, #=status=# true)
         end
     end
     if mode == PKGMODE_MANIFEST
         diff = manifest_diff(ctx, manifest₀, manifest₁)
         if !use_as_api
-            printpkgstyle(ctx, :Status, pathrepr(ctx, env.manifest_file); ignore_indent=true)
-            print_diff(ctx, diff; status = true)
+            printpkgstyle(ctx, :Status, pathrepr(ctx, env.manifest_file), #=ignore_indent=# true)
+            print_diff(ctx, diff, #=status=# true)
         end
     elseif mode == PKGMODE_COMBINED
         p = not_in_project(merge(project₀["deps"], project₁["deps"]))
@@ -69,8 +69,8 @@ function status(ctx::Context, mode::PackageMode, use_as_api=false)
         c_diff = filter!(x->x.old != x.new, manifest_diff(ctx, m₀, m₁))
         if !isempty(c_diff)
             if !use_as_api
-                printpkgstyle(ctx, :Status, pathrepr(ctx, env.manifest_file); ignore_indent=true)
-                print_diff(ctx, c_diff; status = true)
+                printpkgstyle(ctx, :Status, pathrepr(ctx, env.manifest_file), #=ignore_indent=# true)
+                print_diff(ctx, c_diff, #=status=# true)
             end
             diff = Base.vcat(c_diff, diff)
         end
@@ -132,7 +132,7 @@ struct DiffEntry
     new::Union{VerInfo,Nothing}
 end
 
-function print_diff(io::IO, ctx::Context, diff::Vector{DiffEntry}; status=false)
+function print_diff(io::IO, ctx::Context, diff::Vector{DiffEntry}, status=false)
     same = all(x.old == x.new for x in diff)
     some_packages_not_downloaded = false
     for x in diff
@@ -181,7 +181,7 @@ function print_diff(io::IO, ctx::Context, diff::Vector{DiffEntry}; status=false)
     end
 end
 # TODO: Use the Context stream
-print_diff(ctx::Context, diff::Vector{DiffEntry}; kwargs...) = print_diff(stdout, ctx, diff; kwargs...)
+print_diff(ctx::Context, diff::Vector{DiffEntry}, status=true) = print_diff(stdout, ctx, diff, status)
 
 function manifest_by_uuid(manifest::Dict)
     entries = Dict{UUID,Dict}()

stdlib/Pkg3/src/Operations.jl

@@ -842,7 +842,7 @@ function build_versions(ctx::Context, uuids::Vector{UUID}; might_need_to_resolve
     for (uuid, name, hash_or_path, build_file) in builds
         log_file = splitext(build_file)[1] * ".log"
         printpkgstyle(ctx, :Building,
-            rpad(name * " ", max_name + 1, "─"), "→ ", Types.pathrepr(ctx, log_file))
+            rpad(name * " ", max_name + 1, "─") * "→ ", Types.pathrepr(ctx, log_file))
         code = """
             empty!(Base.DEPOT_PATH)
             append!(Base.DEPOT_PATH, $(repr(map(abspath, DEPOT_PATH))))
@@ -1121,7 +1121,7 @@ function init(ctx::Context)
         cmderror("Project already initialized at $project_file")
     mkpath(dirname(project_file))
     touch(project_file)
-    printpkgstyle(ctx, :Initialized, "project at ", abspath(project_file))
+    printpkgstyle(ctx, :Initialized, "project at " * abspath(project_file))
 end
 
 end # module

stdlib/Pkg3/src/Types.jl

@@ -621,7 +621,7 @@ function read_manifest(io::IO)
     return manifest
 end
 function read_manifest(file::String)
-        try isfile(file) ? open(read_manifest, file) : read_manifest(devnull)
+    try isfile(file) ? open(read_manifest, file) : read_manifest(devnull)
     catch err
         err isa ErrorException && startswith(err.msg, "ambiguious dependency") || rethrow(err)
         err.msg *= "In manifest file: $file"
@@ -1219,16 +1219,16 @@ function manifest_info(env::EnvCache, uuid::UUID)::Union{Dict{String,Any},Nothin
 end
 
 # TODO: redirect to ctx stream
-function printpkgstyle(io::IO, cmd::Symbol, text::String...; ignore_indent=false)
+function printpkgstyle(io::IO, cmd::Symbol, text::String, ignore_indent=false)
     indent = textwidth(string(:Downloaded))
     ignore_indent && (indent = 0)
     printstyled(io, lpad(string(cmd), indent), color=:green, bold=true)
-    println(io, " ", text...)
+    println(io, " ", text)
 end
 
 # TODO: use ctx specific context
-function printpkgstyle(ctx::Context, cmd::Symbol, text::String...; kwargs...)
-    printpkgstyle(stdout, cmd, text...; kwargs...)
+function printpkgstyle(ctx::Context, cmd::Symbol, text::String, ignore_indent=false)
+    printpkgstyle(stdout, cmd, text)
 end