From 96d7a47658cd4ba3481beb31cc39ca43174ca683 Mon Sep 17 00:00:00 2001 From: Michael Abbott <32575566+mcabbott@users.noreply.github.com> Date: Mon, 18 Mar 2024 15:32:40 -0400 Subject: [PATCH 1/5] Update macro.jl --- src/layers/macro.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layers/macro.jl b/src/layers/macro.jl index 2fb6db0faf..3401a73dfa 100644 --- a/src/layers/macro.jl +++ b/src/layers/macro.jl @@ -89,7 +89,7 @@ end function _check_new_macro(x::T) where T Functors.isleaf(x) && return - Base.depwarn("This type should probably now use `Flux.@layer` instead of `@functor`: $T", Symbol("@functor")) + Base.depwarn(LazyString("This type should probably now use `Flux.@layer` instead of `@functor`: " T), Symbol("@functor")) end _check_new_macro(::Tuple) = nothing # defined by Functors.jl, not by users _check_new_macro(::NamedTuple) = nothing From ade5b451d0e3bc13f94ae83f888036f87d24589c Mon Sep 17 00:00:00 2001 From: Michael Abbott <32575566+mcabbott@users.noreply.github.com> Date: Mon, 18 Mar 2024 15:36:26 -0400 Subject: [PATCH 2/5] Update deprecations.jl --- src/deprecations.jl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/deprecations.jl b/src/deprecations.jl index 4b094e5eb5..12a73ae6f6 100644 --- a/src/deprecations.jl +++ b/src/deprecations.jl @@ -196,8 +196,8 @@ end # Greek-letter keywords deprecated in Flux 0.13 # Arguments (old => new, :function, "β" => "beta") function _greek_ascii_depwarn(βbeta::Pair, func = :loss, names = "" => "") - Base.depwarn("""function $func no longer accepts greek-letter keyword $(names.first) - please use ascii $(names.second) instead""", func) + Base.depwarn(LazyString("function $func no longer accepts greek-letter keyword ", names.first, """ + please use ascii """, names.second, " instead"), func) βbeta.first end _greek_ascii_depwarn(βbeta::Pair{Nothing}, _...) = βbeta.second From faf19ba2ce408b15bfa49331033320458ac7c4a2 Mon Sep 17 00:00:00 2001 From: Michael Abbott <32575566+mcabbott@users.noreply.github.com> Date: Mon, 18 Mar 2024 15:36:42 -0400 Subject: [PATCH 3/5] Update Project.toml --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index bc31cd5d3f..660ca26296 100644 --- a/Project.toml +++ b/Project.toml @@ -1,6 +1,6 @@ name = "Flux" uuid = "587475ba-b771-5e3f-ad9e-33799f191a9c" -version = "0.14.13" +version = "0.14.14" [deps] Adapt = "79e6a3ab-5dfb-504d-930d-738a2a938a0e" From 2b023ca258af452fcef3b82bdf0f563a922023e9 Mon Sep 17 00:00:00 2001 From: Michael Abbott <32575566+mcabbott@users.noreply.github.com> Date: Mon, 18 Mar 2024 15:37:08 -0400 Subject: [PATCH 4/5] Update src/layers/macro.jl Co-authored-by: Lasse Peters --- src/layers/macro.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/layers/macro.jl b/src/layers/macro.jl index 3401a73dfa..ab6f6ae867 100644 --- a/src/layers/macro.jl +++ b/src/layers/macro.jl @@ -89,7 +89,7 @@ end function _check_new_macro(x::T) where T Functors.isleaf(x) && return - Base.depwarn(LazyString("This type should probably now use `Flux.@layer` instead of `@functor`: " T), Symbol("@functor")) + Base.depwarn(LazyString("This type should probably now use `Flux.@layer` instead of `@functor`: ", T), Symbol("@functor")) end _check_new_macro(::Tuple) = nothing # defined by Functors.jl, not by users _check_new_macro(::NamedTuple) = nothing From a33e6dbb92f340144424758d111b4e0e36c7535f Mon Sep 17 00:00:00 2001 From: Michael Abbott <32575566+mcabbott@users.noreply.github.com> Date: Mon, 18 Mar 2024 15:38:06 -0400 Subject: [PATCH 5/5] Update src/deprecations.jl --- src/deprecations.jl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/deprecations.jl b/src/deprecations.jl index 12a73ae6f6..5acdec5455 100644 --- a/src/deprecations.jl +++ b/src/deprecations.jl @@ -196,7 +196,7 @@ end # Greek-letter keywords deprecated in Flux 0.13 # Arguments (old => new, :function, "β" => "beta") function _greek_ascii_depwarn(βbeta::Pair, func = :loss, names = "" => "") - Base.depwarn(LazyString("function $func no longer accepts greek-letter keyword ", names.first, """ + Base.depwarn(LazyString("function ", func, " no longer accepts greek-letter keyword ", names.first, """ please use ascii """, names.second, " instead"), func) βbeta.first end