fix logic, type annotation tidying

Author: IanButterworth

base/loading.jl

@@ -2925,21 +2925,21 @@ function compilecache(pkg::PkgId, path::String, internal_stderr::IO = stderr, in
     end
 end
 
-function rename_unique_ocachefile(tmppath_so, ocachefile_orig, ocachefile = ocachefile_orig, num = 1)
+function rename_unique_ocachefile(tmppath_so::String, ocachefile_orig::String, ocachefile::String = ocachefile_orig, num = 1)
     try
-        rename(tmppath_so, ocachefile::String; force=true)
+        rename(tmppath_so, ocachefile; force=true)
     catch e
         e isa IOError || rethrow()
         # If `rm` was called on a dir containing a loaded DLL, we moved it to temp for cleanup
         # on restart. However the old path cannot be used (UV_EACCES) while the DLL is loaded
-        if !isfile(ocachefile::String) || !(err.code == Base.UV_EACCES)
+        if !isfile(ocachefile) && err.code != Base.UV_EACCES
             rethrow()
         end
         # Windows prevents renaming a file that is in use so if there is a Julia session started
         # with a package image loaded, we cannot rename that file.
         # The code belows append a `_i` to the name of the cache file where `i` is the smallest number such that
         # that cache file does not exist.
-        ocachename, ocacheext = splitext(ocachefile_orig::String)
+        ocachename, ocacheext = splitext(ocachefile_orig)
         ocachefile_unique = ocachename * "_$num" * ocacheext
         ocachefile = rename_unique_ocachefile(tmppath_so, ocachefile_orig, ocachefile_unique, num + 1)
     end