parent
a5f0cd7823
commit
ad9f0328e8
@ -0,0 +1,27 @@
|
||||
From 82d5efc5796e8e4864e495da6280c6edd7d09375 Mon Sep 17 00:00:00 2001
|
||||
From: Olle Jonsson <olle.jonsson@gmail.com>
|
||||
Date: Thu, 17 Dec 2020 14:10:06 +0100
|
||||
Subject: [PATCH] Avoid "deprecated Object#=~ is called on Integer"
|
||||
|
||||
In a test suite I was using, I saw this warning printed liberally:
|
||||
|
||||
warning: deprecated Object#=~ is called on Integer; it always returns nil
|
||||
|
||||
Change inspired by the same kind of fix here: https://github.com/rails/rails/commit/eafff15a023670974bd71efaec51e4c80364b95d
|
||||
---
|
||||
mustermann/lib/mustermann/ast/translator.rb | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/mustermann/lib/mustermann/ast/translator.rb b/mustermann/lib/mustermann/ast/translator.rb
|
||||
index 596e362..87b90c7 100644
|
||||
--- a/mustermann/lib/mustermann/ast/translator.rb
|
||||
+++ b/mustermann/lib/mustermann/ast/translator.rb
|
||||
@@ -120,7 +120,7 @@ def decorator_for(node)
|
||||
# @!visibility private
|
||||
def escape(char, parser: URI::DEFAULT_PARSER, escape: parser.regexp[:UNSAFE], also_escape: nil)
|
||||
escape = Regexp.union(also_escape, escape) if also_escape
|
||||
- char =~ escape ? parser.escape(char, Regexp.union(*escape)) : char
|
||||
+ char.to_s =~ escape ? parser.escape(char, Regexp.union(*escape)) : char
|
||||
end
|
||||
end
|
||||
end
|
@ -0,0 +1,23 @@
|
||||
From 8be5bd4ac3642d9c9582d0a7258f3197fa54bb96 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Padier <paul.padier@outlook.com>
|
||||
Date: Wed, 20 Jul 2022 22:32:25 +0900
|
||||
Subject: [PATCH] Don't call #=~ on objects that don't respond to it
|
||||
|
||||
`Kernel` defined `#=~` up until Ruby 3.2, but it just returned `nil` when the method wasn't redefined by a child class.
|
||||
---
|
||||
mustermann/lib/mustermann/ast/expander.rb | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/mustermann/lib/mustermann/ast/expander.rb b/mustermann/lib/mustermann/ast/expander.rb
|
||||
index 6cb9110..f5ca874 100644
|
||||
--- a/mustermann/lib/mustermann/ast/expander.rb
|
||||
+++ b/mustermann/lib/mustermann/ast/expander.rb
|
||||
@@ -124,6 +124,8 @@ def error_for(values)
|
||||
# @see Mustermann::AST::Translator#expand
|
||||
# @!visibility private
|
||||
ruby2_keywords def escape(string, *args)
|
||||
+ return super unless string.respond_to?(:=~)
|
||||
+
|
||||
# URI::Parser is pretty slow, let's not send every string to it, even if it's unnecessary
|
||||
string =~ /\A\w*\Z/ ? string : super
|
||||
end
|
Loading…
Reference in new issue