Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Pkg.jl invalidations #3712

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Fix Pkg.jl invalidations #3712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c7d2b60
Move Pkg.BinaryPlatforms to Base.BinaryPlatforms.PkgCompat
mkitti Nov 21, 2023
91c1b51
Move UnstableIO to Base
mkitti Nov 21, 2023
4298c53
Merge branch 'mkitti-remove-binaryplatforms-shim' into mkitti-fix-inv…
mkitti Nov 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
144 changes: 0 additions & 144 deletions src/BinaryPlatforms_compat.jl
View file
Open in desktop

This file was deleted.

10 changes: 3 additions & 7 deletions src/Pkg.jl
View file
Open in desktop
Expand Up @@ -10,6 +10,7 @@ import Random
import REPL
import TOML
using Dates
using Base: UnstableIO

export @pkg_str
export PackageSpec
Expand Down Expand Up @@ -41,12 +42,6 @@ const RESPECT_SYSIMAGE_VERSIONS = Ref(true)
# For globally overriding in e.g. tests
const DEFAULT_IO = Ref{Union{IO,Nothing}}(nothing)

struct UnstableIO <: IO
io::IO
end
Base.write(io::UnstableIO, b::UInt8) = write(io.io, b)::Int
Base.get(io::UnstableIO, val, default) = get(io.io, val, default)
Base.print(io::UnstableIO, arg::Union{SubString{String}, String}) = print(io.io, arg)
stderr_f() = something(DEFAULT_IO[], UnstableIO(stderr))
stdout_f() = something(DEFAULT_IO[], UnstableIO(stdout))
const PREV_ENV_PATH = Ref{String}("")
Expand All @@ -62,7 +57,6 @@ include("Versions.jl")
include("Registry/Registry.jl")
include("Resolve/Resolve.jl")
include("Types.jl")
include("BinaryPlatforms_compat.jl")
include("Artifacts.jl")
include("Operations.jl")
include("API.jl")
Expand All @@ -76,6 +70,8 @@ import .Types: PRESERVE_TIERED_INSTALLED, PRESERVE_TIERED, PRESERVE_ALL_INSTALLE
# Import artifacts API
using .Artifacts, .PlatformEngines

# Alias legacy binary platforms compatibility from Base
const BinaryPlatforms = Base.BinaryPlatforms.PkgCompat

"""
PackageMode
Expand Down