move Pkg to stdlib

Author: KristofferC

base/docs/Docs.jl

@@ -416,7 +416,7 @@ function summarize(io::IO, T::DataType, binding)
 end
 
 function summarize(io::IO, m::Module, binding)
-    readme = Pkg.dir(string(m), "README.md")
+    readme = Base.PKG_MODULE_REF[].dir(string(m), "README.md")
     if isfile(readme)
         println(io, "Displaying the `README.md` for the module instead.\n")
         println(io, "---\n")

base/exports.jl

@@ -3,7 +3,6 @@
 export
 # Modules
     Meta,
-    Pkg,
     LibGit2,
     StackTraces,
     Sys,

base/initdefs.jl

@@ -129,7 +129,6 @@ function init_load_path(BINDIR = Sys.BINDIR)
     load_path = get(ENV, "JULIA_LOAD_PATH", "@|@v#.#.#|@v#.#|@v#|@default|@!v#.#")
     append!(empty!(LOAD_PATH), parse_load_path(load_path))
     vers = "v$(VERSION.major).$(VERSION.minor)"
-    push!(LOAD_PATH, Pkg.dir)
     push!(LOAD_PATH, abspath(BINDIR, "..", "local", "share", "julia", "site", vers))
     push!(LOAD_PATH, abspath(BINDIR, "..", "share", "julia", "site", vers))
 end

base/interactiveutil.jl

@@ -340,11 +340,11 @@ function versioninfo(io::IO=STDOUT; verbose::Bool=false, packages::Bool=false)
     end
     if packages || verbose
         println(io, "Packages:")
-        println(io, "  Package Directory: ", Pkg.dir())
+        println(io, "  Package Directory: ", PKG_MODULE_REF[].dir())
         print(io, "  Package Status:")
-        if isdir(Pkg.dir())
+        if isdir(PKG_MODULE_REF[].dir())
             println(io, "")
-            Pkg.status(io)
+            PKG_MODULE_REF[].status(io)
         else
             println(io, " no packages installed")
         end

base/markdown/Markdown.jl

@@ -29,10 +29,10 @@ export readme, license, @md_str, @doc_str
 parse(markdown::AbstractString; flavor = julia) = parse(IOBuffer(markdown), flavor = flavor)
 parse_file(file::AbstractString; flavor = julia) = parse(read(file, String), flavor = flavor)
 
-readme(pkg::AbstractString; flavor = github) = parse_file(Pkg.dir(pkg, "README.md"), flavor = flavor)
+readme(pkg::AbstractString; flavor = github) = parse_file(Base.PKG_MODULE_REF[].dir(pkg, "README.md"), flavor = flavor)
 readme(pkg::Module; flavor = github) = readme(string(pkg), flavor = flavor)
 
-license(pkg::AbstractString; flavor = github) = parse_file(Pkg.dir(pkg, "LICENSE.md"), flavor = flavor)
+license(pkg::AbstractString; flavor = github) = parse_file(Base.PKG_MODULE_REF[].dir(pkg, "LICENSE.md"), flavor = flavor)
 license(pkg::Module; flavor = github) = license(string(pkg), flavor = flavor)
 
 function mdexpr(s, flavor = :julia)

base/precompile.jl

@@ -383,7 +383,6 @@ precompile(Tuple{typeof(Base.show_method_params), Base.GenericIOBuffer{Array{UIn
 precompile(Tuple{typeof(Base.print), Base.GenericIOBuffer{Array{UInt8, 1}}, String, Module})
 precompile(Tuple{typeof(Base.print), Base.GenericIOBuffer{Array{UInt8, 1}}, String, Symbol, String, Int32})
 precompile(Tuple{typeof(Base.reverseind), String, Int64})
-precompile(Tuple{typeof(Base.Pkg.Dir.path)})
 precompile(Tuple{typeof(Base.promote_type), Type{String}, Type{Union{}}})
 precompile(Tuple{typeof(Base.promote_type), Type{Any}, Type{String}})
 precompile(Tuple{typeof(Base.promote_rule), Type{Any}, Type{String}})
@@ -620,7 +619,6 @@ precompile(Tuple{typeof(Base.print), Base.GenericIOBuffer{Array{UInt8, 1}}, Stri
 precompile(Tuple{typeof(Base.print), Base.GenericIOBuffer{Array{UInt8, 1}}, DataType, Char})
 precompile(Tuple{typeof(Base.print), Base.GenericIOBuffer{Array{UInt8, 1}}, typeof(Type), Char})
 precompile(Tuple{typeof(Base.print), Base.GenericIOBuffer{Array{UInt8, 1}}, String, Module, String, Char})
-precompile(Tuple{typeof(Base.Pkg.dir), String, String})
 precompile(Tuple{typeof(Base._setindex!), Base.Dict{Any, Any}, Array{Base.Docs.DocStr, 1}, Symbol, Int64})
 precompile(Tuple{typeof(Base._setindex!), Base.Dict{Any, Any}, Base.Docs.Binding, Symbol, Int64})
 precompile(Tuple{typeof(Base._setindex!), Base.Dict{Any, Any}, Type{Union{}}, Symbol, Int64})

base/reflection.jl

@@ -48,8 +48,8 @@ Get the fully-qualified name of a module as a tuple of symbols. For example,
 
 # Examples
 ```jldoctest
-julia> fullname(Base.Pkg)
-(:Base, :Pkg)
+julia> fullname(Base.Iterators)
+(:Base, :Iterators)
 
 julia> fullname(Main)
 (:Main,)

base/sysimg.jl

@@ -441,8 +441,7 @@ include("missing.jl")
 # libgit2 support
 include("libgit2/libgit2.jl")
 
-# package manager
-include("pkg/pkg.jl")
+const PKG_MODULE_REF = Ref{Module}()
 
 # worker threads
 include("threadcall.jl")
@@ -525,6 +524,7 @@ Base.require(Base, :SuiteSparse)
 Base.require(Base, :Test)
 Base.require(Base, :Unicode)
 Base.require(Base, :REPL)
+Base.require(Base, :Pkg)
 
 @eval Base begin
     @deprecate_binding Test root_module(Base, :Test) true ", run `using Test` instead"
@@ -559,6 +559,8 @@ Base.require(Base, :REPL)
     @deprecate_binding LineEdit        root_module(Base, :REPL).LineEdit        true ", use `REPL.LineEdit` instead"
     @deprecate_binding REPLCompletions root_module(Base, :REPL).REPLCompletions true ", use `REPL.REPLCompletions` instead"
     @deprecate_binding Terminals       root_module(Base, :REPL).Terminals       true ", use `REPL.Terminals` instead"
+
+    @deprecate_binding Pkg root_module(Base, :Pkg) true ", run `using Pkg` instead"
 end
 
 empty!(DEPOT_PATH)

doc/make.jl

@@ -1,5 +1,6 @@
 # Install dependencies needed to build the documentation.
 ENV["JULIA_PKGDIR"] = joinpath(@__DIR__, "deps")
+using Pkg
 Pkg.init()
 cp(joinpath(@__DIR__, "REQUIRE"), Pkg.dir("REQUIRE"); remove_destination = true)
 Pkg.update()
@@ -101,7 +102,6 @@ const PAGES = [
         "base/io-network.md",
         "base/punctuation.md",
         "base/sort.md",
-        "base/pkg.md",
         "base/iterators.md",
         "base/c.md",
         "base/libc.md",

doc/src/base/base.md

@@ -91,7 +91,6 @@ Base.LibGit2
 Base.Libc
 Base.Markdown
 Base.Meta
-Base.Pkg
 Base.StackTraces
 Base.Sys
 Base.Threads