From 88f88b42c326364aa1ca0cc424f91510d0c7888e Mon Sep 17 00:00:00 2001
From: nick evans <nick@rubinick.dev>
Date: Thu, 24 Oct 2024 15:59:37 -0400
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Ensure=20`set`=20is=20loaded=20i?=
 =?UTF-8?q?n=20ruby=203.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

`set` doesn't need to be explicitly loaded in ruby 3.2+.  Previously, we
loaded it in the tests, so they passed.  But running the actual code
that uses Set could raise an exception.
---
 benchmarks/table-regexps.yml            | 2 +-
 lib/net/imap/sequence_set.rb            | 2 ++
 rakelib/string_prep_tables_generator.rb | 2 ++
 test/net/imap/test_sequence_set.rb      | 1 -
 test/net/imap/test_stringprep_tables.rb | 1 -
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/benchmarks/table-regexps.yml b/benchmarks/table-regexps.yml
index 446e7e57..a701f8c6 100644
--- a/benchmarks/table-regexps.yml
+++ b/benchmarks/table-regexps.yml
@@ -1,6 +1,6 @@
 prelude: |
   require "json"
-  require "set"
+  require "set" unless defined?(::Set)
 
   all_codepoints = (0..0x10ffff).map{_1.chr("UTF-8") rescue nil}.compact
 
diff --git a/lib/net/imap/sequence_set.rb b/lib/net/imap/sequence_set.rb
index 40b02dae..7e5206a1 100644
--- a/lib/net/imap/sequence_set.rb
+++ b/lib/net/imap/sequence_set.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "set" unless defined?(::Set)
+
 module Net
   class IMAP
 
diff --git a/rakelib/string_prep_tables_generator.rb b/rakelib/string_prep_tables_generator.rb
index d1b4443d..59028a69 100644
--- a/rakelib/string_prep_tables_generator.rb
+++ b/rakelib/string_prep_tables_generator.rb
@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "set" unless defined?(::Set)
+
 # Generator for stringprep regexps.
 #
 # Combines Unicode character classes with generated tables.  Generated regexps
diff --git a/test/net/imap/test_sequence_set.rb b/test/net/imap/test_sequence_set.rb
index 903eea0a..e8460139 100644
--- a/test/net/imap/test_sequence_set.rb
+++ b/test/net/imap/test_sequence_set.rb
@@ -2,7 +2,6 @@
 
 require "net/imap"
 require "test/unit"
-require "set"
 
 class IMAPSequenceSetTest < Test::Unit::TestCase
   # alias for convenience
diff --git a/test/net/imap/test_stringprep_tables.rb b/test/net/imap/test_stringprep_tables.rb
index 3f9d22f1..b87d1efe 100644
--- a/test/net/imap/test_stringprep_tables.rb
+++ b/test/net/imap/test_stringprep_tables.rb
@@ -3,7 +3,6 @@
 require "net/imap"
 require "test/unit"
 require "json"
-require "set"
 
 require_relative "../../../rakelib/string_prep_tables_generator"