some more minor cleanups on the code base (#922)

Separated from the refactoring I'm working on locally.

Author: aviatesk

src/loading.jl

@@ -30,6 +30,13 @@ function pkg_fileinfo(id::PkgId)
     return nothing
 end
 
+"""
+    parse_pkg_files(id::PkgId)
+
+This function gets called by `watch_package` and runs when a package is first loaded.
+Its job is to organize the files and expressions defining the module so that later we can
+detect and process revisions.
+"""
 function parse_pkg_files(id::PkgId)
     pkgdata = get!(()->PkgData(id), pkgdatas, id)
     if use_compiled_modules()
@@ -67,12 +74,21 @@ function parse_pkg_files(id::PkgId)
     return pkgdata
 end
 
+"""
+    parentfile, included_files = modulefiles(mod::Module)
+
+Return the `parentfile` in which `mod` was defined, as well as a list of any
+other files that were `include`d to define `mod`. If this operation is unsuccessful,
+`(nothing, nothing)` is returned.
+
+All files are returned as absolute paths.
+"""
 function modulefiles(mod::Module)
-    function keypath(filename)
+    function keypath(filename::AbstractString)
         filename = fixpath(filename)
         return get(src_file_key, filename, filename)
     end
-    if isdefined(Base, :moduleloc)
+    @static if isdefined(Base, :moduleloc)
         parentfile = String(Base.moduleloc(mod).file)
     else
         parentfile = String(first(methods(getfield(mod, :eval))).file)

src/packagedef.jl

@@ -89,6 +89,7 @@ include("types.jl")
 include("utils.jl")
 include("parsing.jl")
 include("lowered.jl")
+include("loading.jl")
 include("pkgs.jl")
 include("git.jl")
 include("recipes.jl")
@@ -200,23 +201,18 @@ function fallback_juliadir()
     normpath(candidate)
 end
 
-Core.eval(@__MODULE__, :(global juliadir::String))
-
 """
     Revise.juliadir
 
 Constant specifying full path to julia top-level source directory.
 This should be reliable even for local builds, cross-builds, and binary installs.
 """
-juliadir
-
-juliadir = normpath(
+global juliadir::String =
     if isdir(joinpath(basebuilddir, "base"))
         basebuilddir
     else
         fallback_juliadir()  # Binaries probably end up here. We fall back on Sys.BINDIR
-    end
-)
+    end |> normpath
 
 const cache_file_key = Dict{String,String}() # corrected=>uncorrected filenames
 const src_file_key   = Dict{String,String}() # uncorrected=>corrected filenames
@@ -269,8 +265,6 @@ const silencefile = Ref(joinpath(depsdir, "silence.txt"))  # Ref so that tests d
 ## now this is the right strategy.) From the standpoint of CodeTracking, we should
 ## link the signature to the actual method-defining expression (either :(f() = 1) or :(g() = 2)).
 
-get_method_from_match(mm::Core.MethodMatch) = mm.method
-
 function delete_missing!(exs_sigs_old::ExprsSigs, exs_sigs_new)
     with_logger(_debug_logger) do
         for (ex, sigs) in exs_sigs_old
@@ -281,7 +275,7 @@ function delete_missing!(exs_sigs_old::ExprsSigs, exs_sigs_new)
                 ret = Base._methods_by_ftype(sig, -1, Base.get_world_counter())
                 success = false
                 if !isempty(ret)
-                    m = get_method_from_match(ret[end])   # the last method returned is the least-specific that matches, and thus most likely to be type-equal
+                    m = ret[end].method  # the last method returned is the least-specific that matches, and thus most likely to be type-equal
                     methsig = m.sig
                     if sig <: methsig && methsig <: sig
                         locdefs = get(CodeTracking.method_info, sig, nothing)

src/pkgs.jl

@@ -1,27 +1,3 @@
-using Base: PkgId
-
-include("loading.jl")
-
-"""
-    parse_pkg_files(id::PkgId)
-
-This function gets called by `watch_package` and runs when a package is first loaded.
-Its job is to organize the files and expressions defining the module so that later we can
-detect and process revisions.
-"""
-parse_pkg_files(id::PkgId)
-
-"""
-    parentfile, included_files = modulefiles(mod::Module)
-
-Return the `parentfile` in which `mod` was defined, as well as a list of any
-other files that were `include`d to define `mod`. If this operation is unsuccessful,
-`(nothing, nothing)` is returned.
-
-All files are returned as absolute paths.
-"""
-modulefiles(mod::Module)
-
 # This is primarily used to parse non-precompilable packages.
 # These lack a cache header that lists the files that constitute the package;
 # they also lack the source cache, and so have to parsed immediately or

src/utils.jl

@@ -93,7 +93,7 @@ function unwrap_where(ex::Expr)
     while isexpr(ex, :where)
         ex = ex.args[1]
     end
-    return ex
+    return ex::Expr
 end
 
 function pushex!(exsigs::ExprsSigs, ex::Expr)