From 8605d90255272c3ffb334bd7bea941a5da42cee3 Mon Sep 17 00:00:00 2001 From: Lilith Orion Hafner Date: Sat, 10 Aug 2024 14:30:41 -0500 Subject: [PATCH 1/5] Load ScopedValues with import and adjust usage accordingly --- base/Base.jl | 2 +- base/logging/logging.jl | 2 +- base/mpfr.jl | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/base/Base.jl b/base/Base.jl index 221ab90d8d2a9..b083829d5b8c0 100644 --- a/base/Base.jl +++ b/base/Base.jl @@ -424,7 +424,7 @@ include("weakkeydict.jl") # ScopedValues include("scopedvalues.jl") -using .ScopedValues +import .ScopedValues # metaprogramming include("meta.jl") diff --git a/base/logging/logging.jl b/base/logging/logging.jl index c50f581db89ba..5cf3882a300ec 100644 --- a/base/logging/logging.jl +++ b/base/logging/logging.jl @@ -3,7 +3,7 @@ module CoreLogging import Base: isless, +, -, convert, show -import Base: ScopedValue, with, @with +import Base.ScopedValues: ScopedValue, with, @with export AbstractLogger, diff --git a/base/mpfr.jl b/base/mpfr.jl index ed3ea5937ce87..d393469aa26a1 100644 --- a/base/mpfr.jl +++ b/base/mpfr.jl @@ -109,9 +109,9 @@ end tie_breaker_is_to_even(::MPFRRoundingMode) = true const ROUNDING_MODE = Ref{MPFRRoundingMode}(MPFRRoundNearest) -const CURRENT_ROUNDING_MODE = Base.ScopedValue{MPFRRoundingMode}() +const CURRENT_ROUNDING_MODE = Base.ScopedValues.ScopedValue{MPFRRoundingMode}() const DEFAULT_PRECISION = Ref{Clong}(256) -const CURRENT_PRECISION = Base.ScopedValue{Clong}() +const CURRENT_PRECISION = Base.ScopedValues.ScopedValue{Clong}() # Basic type and initialization definitions # Warning: the constants are MPFR implementation details from @@ -162,7 +162,7 @@ significand_limb_count(x::BigFloat) = div(sizeof(x._d), sizeof(Limb), RoundToZer rounding_raw(::Type{BigFloat}) = something(Base.ScopedValues.get(CURRENT_ROUNDING_MODE), ROUNDING_MODE[]) setrounding_raw(::Type{BigFloat}, r::MPFRRoundingMode) = ROUNDING_MODE[]=r function setrounding_raw(f::Function, ::Type{BigFloat}, r::MPFRRoundingMode) - Base.@with(CURRENT_ROUNDING_MODE => r, f()) + Base.ScopedValues.@with(CURRENT_ROUNDING_MODE => r, f()) end @@ -1109,7 +1109,7 @@ Note: `nextfloat()`, `prevfloat()` do not use the precision mentioned by The `base` keyword requires at least Julia 1.8. """ function setprecision(f::Function, ::Type{BigFloat}, prec::Integer; base::Integer=2) - Base.@with(CURRENT_PRECISION => _convert_precision_from_base(prec, base), f()) + Base.ScopedValues.@with(CURRENT_PRECISION => _convert_precision_from_base(prec, base), f()) end setprecision(f::Function, prec::Integer; base::Integer=2) = setprecision(f, BigFloat, prec; base) From c88faeeb717036c0d51ebd3650052a3de6f73597 Mon Sep 17 00:00:00 2001 From: Dilum Aluthge Date: Sat, 10 Aug 2024 19:27:51 +0000 Subject: [PATCH 2/5] =?UTF-8?q?=F0=9F=A4=96=20[master]=20Bump=20the=20Styl?= =?UTF-8?q?edStrings=20stdlib=20from=20d7496d2=20to=204fcd8bb?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../md5 | 1 + .../sha512 | 1 + .../md5 | 1 - .../sha512 | 1 - stdlib/StyledStrings.version | 2 +- 5 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 deps/checksums/StyledStrings-4fcd8bb0e20845fa8ae30efc1f4d161e97b3da8f.tar.gz/md5 create mode 100644 deps/checksums/StyledStrings-4fcd8bb0e20845fa8ae30efc1f4d161e97b3da8f.tar.gz/sha512 delete mode 100644 deps/checksums/StyledStrings-d7496d24d3f05536bce6a7eb4cd8ca05a75c02aa.tar.gz/md5 delete mode 100644 deps/checksums/StyledStrings-d7496d24d3f05536bce6a7eb4cd8ca05a75c02aa.tar.gz/sha512 diff --git a/deps/checksums/StyledStrings-4fcd8bb0e20845fa8ae30efc1f4d161e97b3da8f.tar.gz/md5 b/deps/checksums/StyledStrings-4fcd8bb0e20845fa8ae30efc1f4d161e97b3da8f.tar.gz/md5 new file mode 100644 index 0000000000000..1840bab09d72d --- /dev/null +++ b/deps/checksums/StyledStrings-4fcd8bb0e20845fa8ae30efc1f4d161e97b3da8f.tar.gz/md5 @@ -0,0 +1 @@ +f5548f0846f3455f2d697d640f87dad7 diff --git a/deps/checksums/StyledStrings-4fcd8bb0e20845fa8ae30efc1f4d161e97b3da8f.tar.gz/sha512 b/deps/checksums/StyledStrings-4fcd8bb0e20845fa8ae30efc1f4d161e97b3da8f.tar.gz/sha512 new file mode 100644 index 0000000000000..b7e40cc7a0a1c --- /dev/null +++ b/deps/checksums/StyledStrings-4fcd8bb0e20845fa8ae30efc1f4d161e97b3da8f.tar.gz/sha512 @@ -0,0 +1 @@ +0be21a60c593296b85023a009831e5fb567313e51d3934b5fadaec2b55d631a20c38116c1371628166da545a779b37b101ff23c360b9e8410e8a9124a6202223 diff --git a/deps/checksums/StyledStrings-d7496d24d3f05536bce6a7eb4cd8ca05a75c02aa.tar.gz/md5 b/deps/checksums/StyledStrings-d7496d24d3f05536bce6a7eb4cd8ca05a75c02aa.tar.gz/md5 deleted file mode 100644 index 3a5fccdec0fba..0000000000000 --- a/deps/checksums/StyledStrings-d7496d24d3f05536bce6a7eb4cd8ca05a75c02aa.tar.gz/md5 +++ /dev/null @@ -1 +0,0 @@ -a02cd2c8bedd83b74917cf3821c89f46 diff --git a/deps/checksums/StyledStrings-d7496d24d3f05536bce6a7eb4cd8ca05a75c02aa.tar.gz/sha512 b/deps/checksums/StyledStrings-d7496d24d3f05536bce6a7eb4cd8ca05a75c02aa.tar.gz/sha512 deleted file mode 100644 index a042e4f306275..0000000000000 --- a/deps/checksums/StyledStrings-d7496d24d3f05536bce6a7eb4cd8ca05a75c02aa.tar.gz/sha512 +++ /dev/null @@ -1 +0,0 @@ -2e86daa832533f0369e66e359d7d8f47002f93525f83233c809007a13dfd05a201bcd273b3cb4f3eba2586e98cc9afa43c242f67dc18b91fc898d98a0bd8fde9 diff --git a/stdlib/StyledStrings.version b/stdlib/StyledStrings.version index 2067083aec74b..c6c26ee763e71 100644 --- a/stdlib/StyledStrings.version +++ b/stdlib/StyledStrings.version @@ -1,4 +1,4 @@ STYLEDSTRINGS_BRANCH = main -STYLEDSTRINGS_SHA1 = d7496d24d3f05536bce6a7eb4cd8ca05a75c02aa +STYLEDSTRINGS_SHA1 = 4fcd8bb0e20845fa8ae30efc1f4d161e97b3da8f STYLEDSTRINGS_GIT_URL := https://github.com/JuliaLang/StyledStrings.jl.git STYLEDSTRINGS_TAR_URL = https://api.github.com/repos/JuliaLang/StyledStrings.jl/tarball/$1 From cd6f4b4d7d329c08b9a97b61d7f4eecc159c4159 Mon Sep 17 00:00:00 2001 From: Lilith Orion Hafner Date: Mon, 12 Aug 2024 13:24:59 +0000 Subject: [PATCH 3/5] Remove import --- base/Base.jl | 1 - 1 file changed, 1 deletion(-) diff --git a/base/Base.jl b/base/Base.jl index b083829d5b8c0..082fb55a00ef0 100644 --- a/base/Base.jl +++ b/base/Base.jl @@ -424,7 +424,6 @@ include("weakkeydict.jl") # ScopedValues include("scopedvalues.jl") -import .ScopedValues # metaprogramming include("meta.jl") From 4e48260635d4a5e47a159e400fe3f9dc3dcf637a Mon Sep 17 00:00:00 2001 From: Lilith Orion Hafner Date: Mon, 12 Aug 2024 16:21:05 +0000 Subject: [PATCH 4/5] Delete deps/checksums/StyledStrings-4fcd8bb0e20845fa8ae30efc1f4d161e97b3da8f.tar.gz/md5 --- .../md5 | 1 - 1 file changed, 1 deletion(-) delete mode 100644 deps/checksums/StyledStrings-4fcd8bb0e20845fa8ae30efc1f4d161e97b3da8f.tar.gz/md5 diff --git a/deps/checksums/StyledStrings-4fcd8bb0e20845fa8ae30efc1f4d161e97b3da8f.tar.gz/md5 b/deps/checksums/StyledStrings-4fcd8bb0e20845fa8ae30efc1f4d161e97b3da8f.tar.gz/md5 deleted file mode 100644 index 1840bab09d72d..0000000000000 --- a/deps/checksums/StyledStrings-4fcd8bb0e20845fa8ae30efc1f4d161e97b3da8f.tar.gz/md5 +++ /dev/null @@ -1 +0,0 @@ -f5548f0846f3455f2d697d640f87dad7 From 0ce702801bb741def6f6a93f0573692a6b7cba7c Mon Sep 17 00:00:00 2001 From: Lilith Orion Hafner Date: Mon, 12 Aug 2024 16:21:14 +0000 Subject: [PATCH 5/5] Delete deps/checksums/StyledStrings-4fcd8bb0e20845fa8ae30efc1f4d161e97b3da8f.tar.gz/sha512 --- .../sha512 | 1 - 1 file changed, 1 deletion(-) delete mode 100644 deps/checksums/StyledStrings-4fcd8bb0e20845fa8ae30efc1f4d161e97b3da8f.tar.gz/sha512 diff --git a/deps/checksums/StyledStrings-4fcd8bb0e20845fa8ae30efc1f4d161e97b3da8f.tar.gz/sha512 b/deps/checksums/StyledStrings-4fcd8bb0e20845fa8ae30efc1f4d161e97b3da8f.tar.gz/sha512 deleted file mode 100644 index b7e40cc7a0a1c..0000000000000 --- a/deps/checksums/StyledStrings-4fcd8bb0e20845fa8ae30efc1f4d161e97b3da8f.tar.gz/sha512 +++ /dev/null @@ -1 +0,0 @@ -0be21a60c593296b85023a009831e5fb567313e51d3934b5fadaec2b55d631a20c38116c1371628166da545a779b37b101ff23c360b9e8410e8a9124a6202223