From 2a3dc006b264259e05d0cc30f9291c56f5d6fe45 Mon Sep 17 00:00:00 2001 From: Charlie Sharpsteen Date: Thu, 16 Jul 2026 08:17:03 -0500 Subject: [PATCH] Reapply "require 'set'" removals As of OpenVoxProject/openvox-server#468, the entire OpenVox 9 ecosystem is running on Ruby 3.2 or newer. These `require 'set'` removals should be safe to apply. This reverts commit 3086a9ce48b894180453c6184014d07aa91ef7ff. Signed-off-by: Charlie Sharpsteen --- lib/puppet/graph/simple_graph.rb | 1 - lib/puppet/module_tool/metadata.rb | 1 - lib/puppet/provider/package/pacman.rb | 1 - lib/puppet/settings/base_setting.rb | 1 - lib/puppet/transaction.rb | 1 - lib/puppet/util/tag_set.rb | 1 - 6 files changed, 6 deletions(-) diff --git a/lib/puppet/graph/simple_graph.rb b/lib/puppet/graph/simple_graph.rb index 9db40b77d8..dc95c43e25 100644 --- a/lib/puppet/graph/simple_graph.rb +++ b/lib/puppet/graph/simple_graph.rb @@ -2,7 +2,6 @@ require_relative '../../puppet/external/dot' require_relative '../../puppet/relationship' -require 'set' # rubocop:disable Lint/RedundantRequireStatement # A hopefully-faster graph class to replace the use of GRATR. class Puppet::Graph::SimpleGraph diff --git a/lib/puppet/module_tool/metadata.rb b/lib/puppet/module_tool/metadata.rb index 8fd38481d0..0d107a7225 100644 --- a/lib/puppet/module_tool/metadata.rb +++ b/lib/puppet/module_tool/metadata.rb @@ -4,7 +4,6 @@ require_relative '../../puppet/network/format_support' require 'uri' require_relative '../../puppet/util/json' -require 'set' # rubocop:disable Lint/RedundantRequireStatement module Puppet::ModuleTool # This class provides a data structure representing a module's metadata. diff --git a/lib/puppet/provider/package/pacman.rb b/lib/puppet/provider/package/pacman.rb index 495f4a0944..8da72b806d 100644 --- a/lib/puppet/provider/package/pacman.rb +++ b/lib/puppet/provider/package/pacman.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require_relative '../../../puppet/provider/package' -require 'set' # rubocop:disable Lint/RedundantRequireStatement require 'uri' Puppet::Type.type(:package).provide :pacman, :parent => Puppet::Provider::Package do diff --git a/lib/puppet/settings/base_setting.rb b/lib/puppet/settings/base_setting.rb index d55e2e915d..3bea095311 100644 --- a/lib/puppet/settings/base_setting.rb +++ b/lib/puppet/settings/base_setting.rb @@ -1,6 +1,5 @@ # frozen_string_literal: true -require 'set' # rubocop:disable Lint/RedundantRequireStatement require_relative '../../puppet/settings/errors' # The base setting type diff --git a/lib/puppet/transaction.rb b/lib/puppet/transaction.rb index def066ed5a..254420ce16 100644 --- a/lib/puppet/transaction.rb +++ b/lib/puppet/transaction.rb @@ -5,7 +5,6 @@ require_relative '../puppet/util/skip_tags' require_relative '../puppet/application' require 'digest/sha1' -require 'set' # rubocop:disable Lint/RedundantRequireStatement # the class that actually walks our resource/property tree, collects the changes, # and performs them diff --git a/lib/puppet/util/tag_set.rb b/lib/puppet/util/tag_set.rb index 632df3ffea..91e509851b 100644 --- a/lib/puppet/util/tag_set.rb +++ b/lib/puppet/util/tag_set.rb @@ -1,6 +1,5 @@ # frozen_string_literal: true -require 'set' # rubocop:disable Lint/RedundantRequireStatement require_relative '../../puppet/network/format_support' class Puppet::Util::TagSet < Set