From 4a9d46ce07c5135e6a1fbc7da5ea9b1f21030d94 Mon Sep 17 00:00:00 2001
From: Takashi Kokubun <takashi.kokubun@shopify.com>
Date: Tue, 13 May 2025 11:00:02 -0700
Subject: [PATCH] [ruby/erb] Refactor the logic of require 'erb/escape'
 (https://github.com/ruby/erb/pull/61)

https://github.com/ruby/erb/commit/1c393aa738
---
 lib/erb/util.rb | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/lib/erb/util.rb b/lib/erb/util.rb
index 07151207bf..dc9ab3831b 100644
--- a/lib/erb/util.rb
+++ b/lib/erb/util.rb
@@ -8,14 +8,11 @@
 # TruffleRuby: lib/truffle/cgi/escape.rb requires 'cgi/util'.
 require 'cgi/escape'
 
-begin
-  # We don't build the C extension for JRuby, TruffleRuby, and WASM
-  if $LOAD_PATH.resolve_feature_path('erb/escape')
-    require 'erb/escape'
-  end
-rescue LoadError # resolve_feature_path raises LoadError on TruffleRuby 22.3.0
-end
-unless defined?(ERB::Escape)
+# Load or define ERB::Escape#html_escape.
+# We don't build the C extention 'cgi/escape' for JRuby, TruffleRuby, and WASM.
+if $LOAD_PATH.resolve_feature_path('erb/escape')
+  require 'erb/escape'
+else
   # ERB::Escape
   #
   # A subset of ERB::Util. Unlike ERB::Util#html_escape, we expect/hope