From 7893e462c9f6788e0df612e3a0d2022ad32ca675 Mon Sep 17 00:00:00 2001 From: Hendrik Ranocha Date: Wed, 7 Sep 2022 08:35:45 +0200 Subject: [PATCH 1/5] improve type stability of `process_overrides(artifact_dict::Dict, pkg_uuid::Base.UUID)` This fixes some invalidations when loading Static.jl --- stdlib/Artifacts/src/Artifacts.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stdlib/Artifacts/src/Artifacts.jl b/stdlib/Artifacts/src/Artifacts.jl index 1a3214acc3c87..b49525a875e76 100644 --- a/stdlib/Artifacts/src/Artifacts.jl +++ b/stdlib/Artifacts/src/Artifacts.jl @@ -329,7 +329,7 @@ function process_overrides(artifact_dict::Dict, pkg_uuid::Base.UUID) for name in keys(artifact_dict) # Skip names that we're not overriding - if !haskey(pkg_overrides, name) + if !(haskey(pkg_overrides, name)::Bool) continue end From add3e15bb5250caad664ec1be88aa02d656ab8b6 Mon Sep 17 00:00:00 2001 From: Hendrik Ranocha Date: Wed, 7 Sep 2022 10:40:29 +0200 Subject: [PATCH 2/5] apply suggestion of KristofferC --- stdlib/Artifacts/src/Artifacts.jl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/stdlib/Artifacts/src/Artifacts.jl b/stdlib/Artifacts/src/Artifacts.jl index b49525a875e76..3eec826fd07ec 100644 --- a/stdlib/Artifacts/src/Artifacts.jl +++ b/stdlib/Artifacts/src/Artifacts.jl @@ -325,11 +325,11 @@ function process_overrides(artifact_dict::Dict, pkg_uuid::Base.UUID) # override for this UUID, and inserting new overrides for those hashes. overrides = load_overrides() if haskey(overrides[:UUID], pkg_uuid) - pkg_overrides = overrides[:UUID][pkg_uuid] + pkg_overrides = overrides[:UUID][pkg_uuid]::Dict{String, Any} for name in keys(artifact_dict) # Skip names that we're not overriding - if !(haskey(pkg_overrides, name)::Bool) + if !haskey(pkg_overrides, name) continue end From 72f7de83b6d96f743b96615e6d2882f7eee28590 Mon Sep 17 00:00:00 2001 From: Hendrik Ranocha Date: Wed, 7 Sep 2022 18:45:49 +0200 Subject: [PATCH 3/5] Update Artifacts.jl --- stdlib/Artifacts/src/Artifacts.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stdlib/Artifacts/src/Artifacts.jl b/stdlib/Artifacts/src/Artifacts.jl index 3eec826fd07ec..f70909bfcefac 100644 --- a/stdlib/Artifacts/src/Artifacts.jl +++ b/stdlib/Artifacts/src/Artifacts.jl @@ -325,7 +325,7 @@ function process_overrides(artifact_dict::Dict, pkg_uuid::Base.UUID) # override for this UUID, and inserting new overrides for those hashes. overrides = load_overrides() if haskey(overrides[:UUID], pkg_uuid) - pkg_overrides = overrides[:UUID][pkg_uuid]::Dict{String, Any} + pkg_overrides = overrides[:UUID][pkg_uuid]::Dict{String} for name in keys(artifact_dict) # Skip names that we're not overriding From e2d906c5cab72995e23e4e48fe205936b0af56ef Mon Sep 17 00:00:00 2001 From: Hendrik Ranocha Date: Wed, 7 Sep 2022 18:46:28 +0200 Subject: [PATCH 4/5] Update Artifacts.jl --- stdlib/Artifacts/src/Artifacts.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stdlib/Artifacts/src/Artifacts.jl b/stdlib/Artifacts/src/Artifacts.jl index f70909bfcefac..77fccf702a8a1 100644 --- a/stdlib/Artifacts/src/Artifacts.jl +++ b/stdlib/Artifacts/src/Artifacts.jl @@ -325,7 +325,7 @@ function process_overrides(artifact_dict::Dict, pkg_uuid::Base.UUID) # override for this UUID, and inserting new overrides for those hashes. overrides = load_overrides() if haskey(overrides[:UUID], pkg_uuid) - pkg_overrides = overrides[:UUID][pkg_uuid]::Dict{String} + pkg_overrides = overrides[:UUID][pkg_uuid]::Dict{String, : Date: Wed, 7 Sep 2022 18:47:23 +0200 Subject: [PATCH 5/5] Update Artifacts.jl --- stdlib/Artifacts/src/Artifacts.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stdlib/Artifacts/src/Artifacts.jl b/stdlib/Artifacts/src/Artifacts.jl index 77fccf702a8a1..5c02803959f05 100644 --- a/stdlib/Artifacts/src/Artifacts.jl +++ b/stdlib/Artifacts/src/Artifacts.jl @@ -325,7 +325,7 @@ function process_overrides(artifact_dict::Dict, pkg_uuid::Base.UUID) # override for this UUID, and inserting new overrides for those hashes. overrides = load_overrides() if haskey(overrides[:UUID], pkg_uuid) - pkg_overrides = overrides[:UUID][pkg_uuid]::Dict{String, :