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

release-1.8: Backports for 1.8-rc3 #45986

Merged
merged 3 commits into from
Jul 12, 2022
Merged

release-1.8: Backports for 1.8-rc3 #45986

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
5c5d54a
Update nghttp2 to 1.47.0 (#45408)
fxcoudert May 21, 2022
bf46593
Add channel state checks to reduce exceptions
kpamnany Jul 8, 2022
9f5e58a
Update `Documenter` version, deploy to tarball (#45988)
staticfloat Jul 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions base/channels.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -493,14 +493,18 @@ function show(io::IO, ::MIME"text/plain", c::Channel)
end

function iterate(c::Channel, state=nothing)
try
return (take!(c), nothing)
catch e
if isa(e, InvalidStateException) && e.state === :closed
return nothing
else
rethrow()
if isopen(c) || isready(c)
try
return (take!(c), nothing)
catch e
if isa(e, InvalidStateException) && e.state === :closed
return nothing
else
rethrow()
end
end
else
return nothing
end
end

Expand Down
24 changes: 13 additions & 11 deletions base/task.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,19 +415,21 @@ function sync_end(c::Channel{Any})
# Capture all waitable objects scheduled after the end of `@sync` and
# include them in the exception. This way, the user can check what was
# scheduled by examining at the exception object.
local racy
for r in c
if !@isdefined(racy)
racy = []
if isready(c)
local racy
for r in c
if !@isdefined(racy)
racy = []
end
push!(racy, r)
end
push!(racy, r)
end
if @isdefined(racy)
if !@isdefined(c_ex)
c_ex = CompositeException()
if @isdefined(racy)
if !@isdefined(c_ex)
c_ex = CompositeException()
end
# Since this is a clear programming error, show this exception first:
pushfirst!(c_ex, ScheduledAfterSyncException(racy))
end
# Since this is a clear programming error, show this exception first:
pushfirst!(c_ex, ScheduledAfterSyncException(racy))
end

if @isdefined(c_ex)
Expand Down
2 changes: 1 addition & 1 deletion deps/Versions.make
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ MPFR_VER := 4.1.0
MPFR_JLL_NAME := MPFR

# nghttp2
NGHTTP2_VER := 1.41.0
NGHTTP2_VER := 1.47.0
NGHTTP2_JLL_NAME := nghttp2

# Objconv (we don't ship this, so no need for a fake JLL; therefore we specify the JLL_VER here)
Expand Down
68 changes: 34 additions & 34 deletions deps/checksums/nghttp2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
nghttp2-1.41.0.tar.bz2/md5/523d330f62560a2fe4268beb84920890
nghttp2-1.41.0.tar.bz2/sha512/61de1bbbe91230ebe9f7a3ef4d3874391f8180d93c8ff1e94a58035e4061d2f9057e5ba2b90f6fe86f6aefc7244795385d176a862019c47a3aad974b60caa143
nghttp2.v1.41.0+1.aarch64-apple-darwin.tar.gz/md5/727cf8227b41aff95c91b9db31fbe303
nghttp2.v1.41.0+1.aarch64-apple-darwin.tar.gz/sha512/86067f3d04bc1b1cbaafd044ee6eb6c306ab27ba1828290412e62bbd2637d1be90cba437c8c39b853df0b11776d90a6525c9d0d9750abd9462003cb319e38cb6
nghttp2.v1.41.0+1.aarch64-linux-gnu.tar.gz/md5/9a1c71ba214a363072002ea4856c9f93
nghttp2.v1.41.0+1.aarch64-linux-gnu.tar.gz/sha512/16a18a1d2e3486243cc419362f195e29e0bd64344a2b7167da6b10fe6efff1a6c7bd07806915358aa3ec5dd2590e9bd02024df1e3723432ba3dc833ee52f292f
nghttp2.v1.41.0+1.aarch64-linux-musl.tar.gz/md5/1ed0166911be5703d0d6377b666e63c6
nghttp2.v1.41.0+1.aarch64-linux-musl.tar.gz/sha512/632b6ea76e89b60d2c4f0379a88b0a33468dafcaa3605b69b3a5f57546d5036e7003341ea14060ecc417e659b74130597278c71cc34052ff7188472e23bf7092
nghttp2.v1.41.0+1.armv6l-linux-gnueabihf.tar.gz/md5/288b56ea29c570c01cd52683085d1ff4
nghttp2.v1.41.0+1.armv6l-linux-gnueabihf.tar.gz/sha512/91bd764317b72df51289e67616771d5299ee32ad6222993555abc9bf4af5ce1920bed6a9bb2f03145c41bec557460a357d79f7716774f6b730629b225ec5b2df
nghttp2.v1.41.0+1.armv6l-linux-musleabihf.tar.gz/md5/acba1517897a8e43aa3707d9d02c03a2
nghttp2.v1.41.0+1.armv6l-linux-musleabihf.tar.gz/sha512/908db4e29550c277acffe2043b97a0e7946b45f9324b93b2c63fbe83bbd9edd5e899a6665925d1bb85c5662f301de7612829cc36e8edccc3de57ac54911d7357
nghttp2.v1.41.0+1.armv7l-linux-gnueabihf.tar.gz/md5/2b0fb368ffecdd5f527eebca88925092
nghttp2.v1.41.0+1.armv7l-linux-gnueabihf.tar.gz/sha512/8ddd95df9896856f77be0af35fa9cb3c276a6cab2528553c08a2ba68014a5320d6ba7bd370bde362ba48a2fe097f6d5c348f5d8b20e1762010a9bb63c7bec502
nghttp2.v1.41.0+1.armv7l-linux-musleabihf.tar.gz/md5/30baa03195b0560adf729f1aefd0d961
nghttp2.v1.41.0+1.armv7l-linux-musleabihf.tar.gz/sha512/c93d9db188ccacb3da80a51c84799c91d686563cb055e2528094600be2565f608ceb57db9570f36a1933754a45e8f007e3c2a8de13de332effe0e5879814e5ee
nghttp2.v1.41.0+1.i686-linux-gnu.tar.gz/md5/5bc7fbde702b477d28c1843c6ff053cc
nghttp2.v1.41.0+1.i686-linux-gnu.tar.gz/sha512/2f9317172eb8489fab668cdef156462e1f0b71d365731b358c0f246c873e0ad7dc94b2b27d165f54c57ce6caba2c3fe89b9ce2555e235aaab7b05adbcf6a33ea
nghttp2.v1.41.0+1.i686-linux-musl.tar.gz/md5/75a8870627e4db65706df7af92163492
nghttp2.v1.41.0+1.i686-linux-musl.tar.gz/sha512/f1ea9b7e66d01de30a92da34fcc72cbd9c988ed768f8d8099d68f031ccc33d9f965460289a183ae1f9f507580d25020366a312b61fbbcd3b2f06ee697f8cd133
nghttp2.v1.41.0+1.i686-w64-mingw32.tar.gz/md5/258224cfa14b53e7af79caa1dea2eb2c
nghttp2.v1.41.0+1.i686-w64-mingw32.tar.gz/sha512/69a783d09e9258df81ad6121906f8102ad2959c623efca9fff7adf062c947d6e9a44fdab27cdd49bb08519b4a4d636bc529715771d276a69c6e3604237712056
nghttp2.v1.41.0+1.powerpc64le-linux-gnu.tar.gz/md5/a358200b27f3229fc888d3e1763cca0a
nghttp2.v1.41.0+1.powerpc64le-linux-gnu.tar.gz/sha512/cc02237e70e1cafea3e59e9929a4bd86a9b4dbd2928c812b3e654dcc91b87077d91284e7006799186b324ca5f8822d09e3bce1d4a69cea18f42d4e08f6aa5f3b
nghttp2.v1.41.0+1.x86_64-apple-darwin.tar.gz/md5/fe76513593627368edcb95783b830ed1
nghttp2.v1.41.0+1.x86_64-apple-darwin.tar.gz/sha512/fbabf532cc32277394b66cbd1c011c4d7a65380c2759b1cf57e57599c3c8752fbd2d86b42677159005d6430025b4fde5f623d814629215449fd934d1328589dc
nghttp2.v1.41.0+1.x86_64-linux-gnu.tar.gz/md5/ca57b30aa01b0a8f69babed6398bad9a
nghttp2.v1.41.0+1.x86_64-linux-gnu.tar.gz/sha512/3fa5a6806bf6eeb4305038b2c6c381e815988b1a37bcacb4510c229f9186e280aa98fd023495b3fd77c4f16314f81b7233778cd81cc3e3d64f503dac3e1ad70f
nghttp2.v1.41.0+1.x86_64-linux-musl.tar.gz/md5/043dbfb6df2778a1b0ea57c70b982974
nghttp2.v1.41.0+1.x86_64-linux-musl.tar.gz/sha512/70d7ad982fe3b9de49cc37758588c02e78e306ab3ac84682e130e2ab4541814790ec3e201daa96cdd900ebc8fc0a7c1ff6e02e796a65f092c6c24b56c1214b3b
nghttp2.v1.41.0+1.x86_64-unknown-freebsd.tar.gz/md5/13a4e74ffd31852b885e44f2f0fed516
nghttp2.v1.41.0+1.x86_64-unknown-freebsd.tar.gz/sha512/c81b76e9cb2920a0cc554fb9ff23f0cf20f3f9601276fcc07d1ffe0df608cbcc2513b31273f839eed3798cd2183fe9ad0580c833707526a4b8cfddbbc7b53006
nghttp2.v1.41.0+1.x86_64-w64-mingw32.tar.gz/md5/635cc7c17cbe5de2d7e320c0d920e61c
nghttp2.v1.41.0+1.x86_64-w64-mingw32.tar.gz/sha512/e6e0543b2835eab2f4774e027e921acfd1d2a9229876d6acf5c64dc61f7dc73c078d6489910b3179aee4ccb95aa7281b1502170aa6256e41ab1516982d0da230
nghttp2-1.47.0.tar.bz2/md5/2bca98caef4b5c27d5bdc4732f36a5d6
nghttp2-1.47.0.tar.bz2/sha512/4dbd0fe10f5c68d363ee0fff2aceb97f58a755a276796f16b078cd3bec3a17cd5e0dadf1e5027347d3342daa3572332b14df230a4d9675a9b57fff67f8f9e5a3
nghttp2.v1.47.0+0.aarch64-apple-darwin.tar.gz/md5/76abe33c6e81346a133c3e26593db1b2
nghttp2.v1.47.0+0.aarch64-apple-darwin.tar.gz/sha512/72a1302134ab4715f4c0b8f702a566498d4595aa7a3fd762e43d7e0ca5987506a9b1dc53318763595ad652d8c4a633c3c5e0500a8f4e3007cb6cf9e30341d9ff
nghttp2.v1.47.0+0.aarch64-linux-gnu.tar.gz/md5/1e5ad3ad31290e017c930c2d1dbda38d
nghttp2.v1.47.0+0.aarch64-linux-gnu.tar.gz/sha512/c8a2543f079751bcaf7165661f5f4053fd1b733cde0f82078736c898503c796fdd7ce587f0da2d1bb3d35a74a644fed6e8cc30a3520e577593d19700e822cc55
nghttp2.v1.47.0+0.aarch64-linux-musl.tar.gz/md5/7079c203ec5e6fcf45d01bfa1ca0b1b8
nghttp2.v1.47.0+0.aarch64-linux-musl.tar.gz/sha512/152f34f1e9a5f741d69d62587762a96fd290ecb41ec8eeff46fae39b5e606ff054755b88abe3bcaa07db640526fc12546769da4a3761a18240eb3d2699de8886
nghttp2.v1.47.0+0.armv6l-linux-gnueabihf.tar.gz/md5/918f3e549998e34f2aa292a2ff7945be
nghttp2.v1.47.0+0.armv6l-linux-gnueabihf.tar.gz/sha512/545c5674a6492dbd5f109303383b920b0b011e37e8a4abfb329b22cab50a6a977d9f74aac6f4aaa833064fbaae4b5ebc019e83d2edb8b4af2515f36f4530937f
nghttp2.v1.47.0+0.armv6l-linux-musleabihf.tar.gz/md5/1345980d4822c6e9c1934378e365e343
nghttp2.v1.47.0+0.armv6l-linux-musleabihf.tar.gz/sha512/470c66205d257ba3b23b0db8ea93fe40bc71c219d50cd88a6b57abf8c105218bd9912b9a605da12903793893f37803b0e3357566e20035a079ed2b4bcc6d7b78
nghttp2.v1.47.0+0.armv7l-linux-gnueabihf.tar.gz/md5/e831c03eeb810a48fbd34df2017c20be
nghttp2.v1.47.0+0.armv7l-linux-gnueabihf.tar.gz/sha512/e90270b1f6ae7c90ce746f60c2f451f2271ec6f682003f3a0ee8eb97e9054932495fff22b2ca1f40e3711f847c520fa605c49c7ae671db7f282f78f8d745a0db
nghttp2.v1.47.0+0.armv7l-linux-musleabihf.tar.gz/md5/38d95842aa0d9e9ac9e77e468d18893d
nghttp2.v1.47.0+0.armv7l-linux-musleabihf.tar.gz/sha512/5e595d143248fadd5cfffa1f15b09698f1793c04422b12d5f8e22c52e4ebc5d947845fe3ef7539845ad731d4457c8a7a6e6e2bc1dbb5b32fd3cd374963aa9833
nghttp2.v1.47.0+0.i686-linux-gnu.tar.gz/md5/a3c54ab31e835ecbc12425b00a201bbf
nghttp2.v1.47.0+0.i686-linux-gnu.tar.gz/sha512/375354d57b14b73d7e4cf751b69872b19e6806b7a110c104c0dc25794a33dd89642f9911216c2c1a2698d45878c12b7d735402e44b9b4ba60a5a9751a522c19b
nghttp2.v1.47.0+0.i686-linux-musl.tar.gz/md5/2cdfc4b177bc88685e629362ac754cab
nghttp2.v1.47.0+0.i686-linux-musl.tar.gz/sha512/cb741c7d6dbfe5815e1691c98fac46c2559b419cb3bc882b925779d9699e7b37332ab197bdb3b7cb944de45ea0cc3c6f6e5f8df04b7556dac25f796e992d7dc5
nghttp2.v1.47.0+0.i686-w64-mingw32.tar.gz/md5/ec5f305e52c205a246db0e4ded79f6c8
nghttp2.v1.47.0+0.i686-w64-mingw32.tar.gz/sha512/4bd5f81bd1502bbc04973f0721099a230248b2be907f66f044fd1111326bf05804aae4df123eda65e7e90445157bc07e87d9e837dfd2393038e4e042254c16df
nghttp2.v1.47.0+0.powerpc64le-linux-gnu.tar.gz/md5/01431aaf0c383e2ab1460f41e3c64446
nghttp2.v1.47.0+0.powerpc64le-linux-gnu.tar.gz/sha512/ef3ed6eb1c77a81f46f7c06e4748d766144231ab3cc4875fb3502c6a553ce04937ee6dcb1516532c91043921b76779c1ea1ca20070907d3639d2f0fb036d0d56
nghttp2.v1.47.0+0.x86_64-apple-darwin.tar.gz/md5/12650859c3ba16131a35b63510816267
nghttp2.v1.47.0+0.x86_64-apple-darwin.tar.gz/sha512/a91d6b572ed830bdcd5822d8d0dbca70ce45f0c2706a1fb83aeccacad1a72391ea09683169ae9d8ed6e84a1f28d55d2ee26e49a68cca405dd032e9c128e54858
nghttp2.v1.47.0+0.x86_64-linux-gnu.tar.gz/md5/62fb16238af3cf50721b0a671d28dc8c
nghttp2.v1.47.0+0.x86_64-linux-gnu.tar.gz/sha512/f662f30ad7057bc9c724fd48e15a2894aa0a345a24d35acaa0f3cb25d73b329772942d3499647ba7563c110d2186e96d4a3b12e8721d28d2cd6491d93df24e05
nghttp2.v1.47.0+0.x86_64-linux-musl.tar.gz/md5/3224892e3e5c7d7ae24c2380fd731ab8
nghttp2.v1.47.0+0.x86_64-linux-musl.tar.gz/sha512/35d18c52dee94846a85d5a7a19bff95ce2b05e5290096d532c7f3d144ee809a2ba9072dd24372905c485ee0dfa03309be8cebead2b62292518ab5d63d80c9e4a
nghttp2.v1.47.0+0.x86_64-unknown-freebsd.tar.gz/md5/4b3c9032b11ba078d7a91a30d3cabc6a
nghttp2.v1.47.0+0.x86_64-unknown-freebsd.tar.gz/sha512/21c9d1c95e26bf33a0cedc63ac6e81dcc670d6bc3fefc9a8efbf7faff718875cf6fc51dfdb192afb00acf86257104de7a0dfcaaf29119ba055b69885c31a4dd4
nghttp2.v1.47.0+0.x86_64-w64-mingw32.tar.gz/md5/7d41384443541bf30b6165381b1c5305
nghttp2.v1.47.0+0.x86_64-w64-mingw32.tar.gz/sha512/2febfcc452bd4f2a3200e6edb8127f678749a358a4beb219b7b29294ade66bb817e1fbdce665f0e3e20d923ab3bc68598f3c769bd4f09871866e452b6aab52d0
1 change: 0 additions & 1 deletion deps/nghttp2.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ $(SRCCACHE)/nghttp2-$(NGHTTP2_VER).tar.bz2: | $(SRCCACHE)
$(SRCCACHE)/nghttp2-$(NGHTTP2_VER)/source-extracted: $(SRCCACHE)/nghttp2-$(NGHTTP2_VER).tar.bz2
$(JLCHECKSUM) $<
cd $(dir $<) && $(TAR) -jxf $<
cp $(SRCDIR)/patches/config.sub $(SRCCACHE)/nghttp2-$(NGHTTP2_VER)/config.sub
touch -c $(SRCCACHE)/nghttp2-$(NGHTTP2_VER)/configure # old target
echo 1 > $@

Expand Down
8 changes: 4 additions & 4 deletions doc/Manifest.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ version = "0.8.6"

[[deps.Documenter]]
deps = ["ANSIColoredPrinters", "Base64", "Dates", "DocStringExtensions", "IOCapture", "InteractiveUtils", "JSON", "LibGit2", "Logging", "Markdown", "REPL", "Test", "Unicode"]
git-tree-sha1 = "122d031e8dcb2d3e767ed434bc4d1ae1788b5a7f"
git-tree-sha1 = "e4967ebb9dce1328d582200b03bcc44c69372312"
uuid = "e30172f5-a6a5-5a46-863b-614d45cd2de4"
version = "0.27.17"
version = "0.27.20"

[[deps.IOCapture]]
deps = ["Logging", "Random"]
Expand Down Expand Up @@ -63,9 +63,9 @@ uuid = "ca575930-c2e3-43a9-ace4-1e988b2c1908"

[[deps.Parsers]]
deps = ["Dates"]
git-tree-sha1 = "1285416549ccfcdf0c50d4997a94331e88d68413"
git-tree-sha1 = "0044b23da09b5608b4ecacb4e5e6c6332f833a7e"
uuid = "69de0a69-1ddd-5017-9359-2bf0b02dc9f0"
version = "2.3.1"
version = "2.3.2"

[[deps.Printf]]
deps = ["Unicode"]
Expand Down
3 changes: 3 additions & 0 deletions doc/make.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,8 @@ end

# Define our own DeployConfig
struct BuildBotConfig <: Documenter.DeployConfig end
Documenter.authentication_method(::BuildBotConfig) = Documenter.HTTPS
Documenter.authenticated_repo_url(::BuildBotConfig) = "https://github.com/JuliaLang/docs.julialang.org.git"
function Documenter.deploy_folder(::BuildBotConfig; devurl, repo, branch, kwargs...)
haskey(ENV, "DOCUMENTER_KEY") || return Documenter.DeployDecision(; all_ok=false)
if Base.GIT_VERSION_INFO.tagged_commit
Expand Down Expand Up @@ -385,4 +387,5 @@ deploydocs(
dirname = "en",
devurl = devurl,
versions = Versions(["v#.#", devurl => devurl]),
archive = get(ENV, "DOCUMENTER_ARCHIVE", nothing),
)
2 changes: 1 addition & 1 deletion stdlib/nghttp2_jll/Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "nghttp2_jll"
uuid = "8e850ede-7688-5339-a07c-302acd2aaf8d"
version = "1.41.0+1"
version = "1.47.0+0"

[deps]
Libdl = "8f399da3-3557-5675-b5ff-fb832c97cbdb"
Expand Down
2 changes: 1 addition & 1 deletion stdlib/nghttp2_jll/test/runtests.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ end

@testset "nghttp2_jll" begin
info = unsafe_load(ccall((:nghttp2_version,libnghttp2), Ptr{nghttp2_info}, (Cint,), 0))
@test VersionNumber(unsafe_string(info.version_str)) == v"1.41.0"
@test VersionNumber(unsafe_string(info.version_str)) == v"1.47.0"
end