some minor code cleanups (#918)

Author: aviatesk

src/loading.jl

@@ -1,9 +1,8 @@
-const badfile = (nothing, nothing, nothing, UInt128(0))
 function pkg_fileinfo(id::PkgId)
     origin = get(Base.pkgorigins, id, nothing)
-    origin === nothing && return badfile
+    origin === nothing && return nothing
     cachepath = origin.cachepath
-    cachepath === nothing && return badfile
+    cachepath === nothing && return nothing
     local checksum
     provides, includes_requires, required_modules = try
         ret = @static if VERSION ≥ v"1.11.0-DEV.683" # https://github.com/JuliaLang/julia/pull/49866
@@ -16,42 +15,38 @@ function pkg_fileinfo(id::PkgId)
             provides, (includes_srcfiles_only, requires), required_modules
         else
             checksum = UInt64(0) # Buildid prior to v"1.12.0-DEV.764", and the `srcfiles_only` API does not take `io`
-            Base.parse_cache_header(cachepath, srcfiles_only = true)
+            Base.parse_cache_header(cachepath; srcfiles_only = true)
         end
         ret
     catch err
-        return badfile
+        return nothing
     end
     includes, _ = includes_requires
     for (pkgid, buildid) in provides
         if pkgid.uuid === id.uuid && pkgid.name == id.name
             return cachepath, includes, first.(required_modules), (UInt128(checksum) << 64 | buildid)
         end
     end
+    return nothing
 end
 
 function parse_pkg_files(id::PkgId)
-    pkgdata = get(pkgdatas, id, nothing)
-    if pkgdata === nothing
-        pkgdata = PkgData(id)
-    end
-    modsym = Symbol(id.name)
+    pkgdata = get!(()->PkgData(id), pkgdatas, id)
     if use_compiled_modules()
-        cachefile, includes, reqs, buildid = pkg_fileinfo(id)
-        if cachefile !== nothing
-            @assert includes !== nothing
-            @assert reqs !== nothing
+        cachefile_includes_reqs_buildid = pkg_fileinfo(id)
+        if cachefile_includes_reqs_buildid !== nothing
+            cachefile, includes, reqs, buildid = cachefile_includes_reqs_buildid
             pkgdata.requirements = reqs
             for chi in includes
-                if isdefined(Base, :maybe_loaded_precompile) && Base.maybe_loaded_precompile(id, buildid) isa Module
-                    mod = Base.maybe_loaded_precompile(id, buildid)
+                if isdefined(Base, :maybe_loaded_precompile) && (mod′ = Base.maybe_loaded_precompile(id, buildid); mod′ isa Module)
+                    mod = mod′
                 elseif isdefined(Base, :loaded_precompiles) && haskey(Base.loaded_precompiles, id => buildid)
                     mod = Base.loaded_precompiles[id => buildid]
                 else
                     mod = Base.root_module(id)
                 end
                 for mpath in chi.modpath
-                    mod = getfield(mod, Symbol(mpath))::Module
+                    mod = getglobal(mod, Symbol(mpath))::Module
                 end
                 fname = relpath(chi.filename, pkgdata)
                 # For precompiled packages, we can read the source later (whenever we need it)
@@ -68,7 +63,7 @@ function parse_pkg_files(id::PkgId)
     # To reduce compiler latency, use runtime dispatch for `queue_includes!`.
     # `queue_includes!` requires compilation of the whole parsing/expression-splitting infrastructure,
     # and it's better to wait to compile it until we actually need it.
-    Base.invokelatest(queue_includes!, pkgdata, id)
+    @invokelatest queue_includes!(pkgdata, id)
     return pkgdata
 end
 
@@ -93,8 +88,9 @@ function modulefiles(mod::Module)
         return keypath(parentfile), [keypath(mf[2]) for mf in included_files]
     end
     use_compiled_modules() || return nothing, nothing   # FIXME: support non-precompiled packages
-    _, filedata, reqs = pkg_fileinfo(id)
-    filedata === nothing && return nothing, nothing
-    included_files = filter(mf->mf.id == id, filedata)
+    cachefile_includes_reqs_buildid = pkg_fileinfo(id)
+    cachefile_includes_reqs_buildid === nothing && return nothing, nothing
+    _, includes, _, _ = cachefile_includes_reqs_buildid
+    included_files = filter(mf->mf.id == id, includes)
     return keypath(parentfile), [keypath(mf.filename) for mf in included_files]
 end

src/packagedef.jl

@@ -1,14 +1,13 @@
 @eval Base.Experimental.@optlevel 1
 
 using FileWatching, REPL, UUIDs
-import LibGit2
+using LibGit2: LibGit2
 using Base: PkgId
 using Base.Meta: isexpr
 using Core: CodeInfo
 
 export revise, includet, entr, MethodSummary
 
-
 # Abstract type to represent a single worker
 abstract type AbstractWorker end
 
@@ -1177,7 +1176,11 @@ function update_stacktrace_lineno!(trace)
         linfo = t.linfo
         if linfo isa Core.CodeInstance
             linfo = linfo.def
-            (isdefined(Core, :ABIOverride) && isa(linfo, Core.ABIOverride)) && (linfo = linfo.def)
+            @static if isdefined(Core, :ABIOverride)
+                if isa(linfo, Core.ABIOverride)
+                    linfo = linfo.def
+                end
+            end
         end
         if linfo isa Core.MethodInstance
             m = linfo.def
@@ -1313,10 +1316,7 @@ function __init__()
     if polling == "1"
         polling_files[] = watching_files[] = true
     end
-    rev_include = get(ENV, "JULIA_REVISE_INCLUDE", "0")
-    if rev_include == "1"
-        tracking_Main_includes[] = true
-    end
+    tracking_Main_includes[] = Base.get_bool_env("JULIA_REVISE_INCLUDE", false)
     # Correct line numbers for code moving around
     Base.update_stackframes_callback[] = update_stacktrace_lineno!
     if isdefined(Base, :methodloc_callback)

src/parsing.jl

@@ -59,10 +59,7 @@ function process_source!(mod_exprs_sigs::ModuleExprsSigs, ex, filename, mod::Mod
                 throw(ReviseEvalException(loc, err, Any[(sf, 1) for sf in stacktrace(bt)]))
             end
         end
-        exprs_sigs = get(mod_exprs_sigs, mod, nothing)
-        if exprs_sigs === nothing
-            mod_exprs_sigs[mod] = exprs_sigs = ExprsSigs()
-        end
+        exprs_sigs = get!(ExprsSigs, mod_exprs_sigs, mod)
         if ex.head === :toplevel
             lnn = nothing
             for a in ex.args

src/utils.jl

@@ -1,6 +1,6 @@
 relpath_safe(path, startpath) = isempty(startpath) ? path : relpath(path, startpath)
 
-function Base.relpath(filename, pkgdata::PkgData)
+function Base.relpath(filename::AbstractString, pkgdata::PkgData)
     if isabspath(filename)
         # `Base.locate_package`, which is how `pkgdata` gets initialized, might strip pieces of the path.
         # For example, on Travis macOS the paths returned by `abspath`

test/common.jl

@@ -23,6 +23,17 @@ else
     const mtimedelay = 0.1
 end
 
+if isdefined(Core, :var"@latestworld")
+    using Core: @latestworld
+else
+    # In older Julia versions, there were more implicit
+    # world age increments, so the macro is generally not
+    # required.
+    macro latestworld()
+        nothing
+    end
+end
+
 yry() = (sleep(mtimedelay); revise(); sleep(mtimedelay))
 macro yry()
     esc(quote

test/non_jl_test.jl

@@ -7,6 +7,7 @@ using Test
 struct MyFile
     file::String
 end
+Base.relpath(file::MyFile, args...) = MyFile(Base.relpath(file.file, args...))
 Base.abspath(file::MyFile) = MyFile(Base.abspath(file.file))
 Base.isabspath(file::MyFile) = Base.isabspath(file.file)
 Base.joinpath(str::String, file::MyFile) = MyFile(Base.joinpath(str, file.file))

test/runtests.jl

@@ -72,17 +72,6 @@ end
 
 const issue639report = []
 
-if isdefined(Core, :var"@latestworld")
-    import Core: @latestworld
-else
-    # In older Julia versions, there were more implicit
-    # world age increments, so the macro is generally not
-    # required.
-    macro latestworld()
-        nothing
-    end
-end
-
 @testset "Revise" begin
     do_test("PkgData") && @testset "PkgData" begin
         # Related to #358