Skip to content

Commit 3aabc3f

Browse files
rename: invalid -> incompatible cache header
1 parent 1157c6f commit 3aabc3f

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

base/loading.jl

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1247,7 +1247,7 @@ function _include_from_serialized(pkg::PkgId, path::String, ocachepath::Union{No
12471247
else
12481248
io = open(path, "r")
12491249
try
1250-
iszero(isvalid_cache_header(io)) && return ArgumentError("Invalid header in cache file $path.")
1250+
iszero(isvalid_cache_header(io)) && return ArgumentError("Incompatible header in cache file $path.")
12511251
_, (includes, _, _), _, _, _, _, _, _ = parse_cache_header(io, path)
12521252
ignore_native = pkg_tracked(includes)
12531253
finally
@@ -1868,7 +1868,7 @@ function isrelocatable(pkg::PkgId)
18681868
isnothing(path) && return false
18691869
io = open(path, "r")
18701870
try
1871-
iszero(isvalid_cache_header(io)) && throw(ArgumentError("Invalid header in cache file $cachefile."))
1871+
iszero(isvalid_cache_header(io)) && throw(ArgumentError("Incompatible header in cache file $cachefile."))
18721872
_, (includes, includes_srcfiles, _), _... = _parse_cache_header(io, path)
18731873
for inc in includes
18741874
!startswith(inc.filename, "@depot") && return false
@@ -1943,7 +1943,7 @@ function _tryrequire_from_serialized(pkg::PkgId, path::String, ocachepath::Union
19431943
io = open(path, "r")
19441944
ignore_native = false
19451945
try
1946-
iszero(isvalid_cache_header(io)) && return ArgumentError("Invalid header in cache file $path.")
1946+
iszero(isvalid_cache_header(io)) && return ArgumentError("Incompatible header in cache file $path.")
19471947
_, (includes, _, _), depmodnames, _, _, _, clone_targets, _ = parse_cache_header(io, path)
19481948

19491949
ignore_native = pkg_tracked(includes)
@@ -3154,7 +3154,7 @@ function compilecache(pkg::PkgId, path::String, internal_stderr::IO = stderr, in
31543154
# append extra crc to the end of the .ji file:
31553155
open(tmppath, "r+") do f
31563156
if iszero(isvalid_cache_header(f))
3157-
error("Invalid header for $(repr("text/plain", pkg)) in new cache file $(repr(tmppath)).")
3157+
error("Incompatible header for $(repr("text/plain", pkg)) in new cache file $(repr(tmppath)).")
31583158
end
31593159
seekend(f)
31603160
write(f, crc_so)
@@ -3478,7 +3478,7 @@ end
34783478
function parse_cache_header(cachefile::String)
34793479
io = open(cachefile, "r")
34803480
try
3481-
iszero(isvalid_cache_header(io)) && throw(ArgumentError("Invalid header in cache file $cachefile."))
3481+
iszero(isvalid_cache_header(io)) && throw(ArgumentError("Incompatible header in cache file $cachefile."))
34823482
ret = parse_cache_header(io, cachefile)
34833483
return ret
34843484
finally
@@ -3491,7 +3491,7 @@ function preferences_hash(cachefile::String)
34913491
io = open(cachefile, "r")
34923492
try
34933493
if iszero(isvalid_cache_header(io))
3494-
throw(ArgumentError("Invalid header in cache file $cachefile."))
3494+
throw(ArgumentError("Incompatible header in cache file $cachefile."))
34953495
end
34963496
return preferences_hash(io, cachefile)
34973497
finally
@@ -3507,7 +3507,7 @@ end
35073507
function cache_dependencies(cachefile::String)
35083508
io = open(cachefile, "r")
35093509
try
3510-
iszero(isvalid_cache_header(io)) && throw(ArgumentError("Invalid header in cache file $cachefile."))
3510+
iszero(isvalid_cache_header(io)) && throw(ArgumentError("Incompatible header in cache file $cachefile."))
35113511
return cache_dependencies(io, cachefile)
35123512
finally
35133513
close(io)
@@ -3547,7 +3547,7 @@ end
35473547
function read_dependency_src(cachefile::String, filename::AbstractString)
35483548
io = open(cachefile, "r")
35493549
try
3550-
iszero(isvalid_cache_header(io)) && throw(ArgumentError("Invalid header in cache file $cachefile."))
3550+
iszero(isvalid_cache_header(io)) && throw(ArgumentError("Incompatible header in cache file $cachefile."))
35513551
return read_dependency_src(io, cachefile, filename)
35523552
finally
35533553
close(io)
@@ -3831,9 +3831,9 @@ end
38313831
try
38323832
checksum = isvalid_cache_header(io)
38333833
if iszero(checksum)
3834-
@debug "Rejecting cache file $cachefile due to it containing an invalid cache header"
3835-
record_reason(reasons, "invalid header")
3836-
return true # invalid cache file
3834+
@debug "Rejecting cache file $cachefile due to it containing an incompatible cache header"
3835+
record_reason(reasons, "incompatible header")
3836+
return true # incompatible cache file
38373837
end
38383838
modules, (includes, _, requires), required_modules, srctextpos, prefs, prefs_hash, clone_targets, actual_flags = parse_cache_header(io, cachefile)
38393839
if isempty(modules)

stdlib/Logging/docs/src/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,10 +191,10 @@ module. Loading julia with `JULIA_DEBUG=loading` will activate
191191

192192
```
193193
$ JULIA_DEBUG=loading julia -e 'using OhMyREPL'
194-
┌ Debug: Rejecting cache file /home/user/.julia/compiled/v0.7/OhMyREPL.ji due to it containing an invalid cache header
194+
┌ Debug: Rejecting cache file /home/user/.julia/compiled/v0.7/OhMyREPL.ji due to it containing an incompatible cache header
195195
└ @ Base loading.jl:1328
196196
[ Info: Recompiling stale cache file /home/user/.julia/compiled/v0.7/OhMyREPL.ji for module OhMyREPL
197-
┌ Debug: Rejecting cache file /home/user/.julia/compiled/v0.7/Tokenize.ji due to it containing an invalid cache header
197+
┌ Debug: Rejecting cache file /home/user/.julia/compiled/v0.7/Tokenize.ji due to it containing an incompatible cache header
198198
└ @ Base loading.jl:1328
199199
...
200200
```

0 commit comments

Comments
 (0)