remove `msf/util` requires

lib/metasploit/framework/compiler/mingw.rb

@@ -1,4 +1,3 @@
-require 'msf/util/helper'
 require 'open3'
 
 module Metasploit

lib/msf/base/sessions/command_shell.rb

@@ -2,7 +2,7 @@
 require 'shellwords'
 require 'rex/text/table'
 require "base64"
-
+require 'rex/parser/arguments'
 module Msf
 module Sessions
 

lib/msf/core/framework.rb

@@ -11,9 +11,10 @@ require 'monitor'
 #
 
 require 'metasploit/framework/version'
-require 'msf/util'
 require 'rex/socket/ssl'
 require 'metasploit/framework/thread_factory_provider'
+require 'rex/job_container'
+require 'rex/thread_factory'
 module Msf
 
 ###

lib/msf/core/rpc/v10/rpc_module.rb

@@ -1,7 +1,6 @@
 # -*- coding: binary -*-
 
 require 'json'
-require 'msf/util/document_generator'
 
 module Msf
 module RPC

lib/msf/ui/console/command_dispatcher/core.rb

@@ -10,7 +10,6 @@ require 'rex/ui/text/output/buffer/stdout'
 # Project
 #
 
-require 'msf/util/document_generator'
 
 require 'msf/core/opt_condition'
 

lib/msf/ui/console/command_dispatcher/payload.rb

@@ -1,7 +1,6 @@
 # -*- coding: binary -*-
 
 require 'rex/parser/arguments'
-require 'msf/util/exe'
 
 module Msf
   module Ui

lib/msf/util.rb

@@ -19,17 +19,11 @@ end
 end
 
 # Executable generation and encoding
-require 'msf/util/exe'
-require 'msf/util/helper'
 
 # Host helpers
-require 'msf/util/host'
 
 # DBManager helpers
-require 'msf/util/db_manager'
 
 # Java deserialization payload generators
-require 'msf/util/java_deserialization'
 
 # .NET deserialization payload generators
-require 'msf/util/dot_net_deserialization'

lib/msf/util/document_generator.rb

@@ -4,7 +4,6 @@
 #
 ###
 
-require 'msf/util/document_generator/pull_request_finder'
 
 module Msf
   module Util

lib/msf/util/dot_net_deserialization.rb

@@ -1,9 +1,4 @@
 require 'bindata'
-require 'msf/util/dot_net_deserialization/assemblies'
-require 'msf/util/dot_net_deserialization/enums'
-require 'msf/util/dot_net_deserialization/types'
-require 'msf/util/dot_net_deserialization/gadget_chains'
-require 'msf/util/dot_net_deserialization/formatters'
 
 module Msf
 module Util

lib/msf/util/dot_net_deserialization/formatters.rb

@@ -3,9 +3,6 @@ module Util
 module DotNetDeserialization
 module Formatters
 
-require 'msf/util/dot_net_deserialization/formatters/binary_formatter'
-require 'msf/util/dot_net_deserialization/formatters/los_formatter'
-require 'msf/util/dot_net_deserialization/formatters/soap_formatter'
 
 NAMES = [
   :BinaryFormatter,

lib/msf/util/dot_net_deserialization/gadget_chains.rb

@@ -3,9 +3,6 @@ module Util
 module DotNetDeserialization
 module GadgetChains
 
-require 'msf/util/dot_net_deserialization/gadget_chains/text_formatting_run_properties'
-require 'msf/util/dot_net_deserialization/gadget_chains/type_confuse_delegate'
-require 'msf/util/dot_net_deserialization/gadget_chains/windows_identity'
 
 NAMES = [
   :TextFormattingRunProperties,

lib/rex/post/meterpreter/ui/console/command_dispatcher/core.rb

@@ -2,6 +2,7 @@
 require 'set'
 require 'rex/post/meterpreter'
 require 'rex/parser/arguments'
+require 'rex'
 
 module Rex
 module Post

modules/auxiliary/gather/windows_secrets_dump.rb

@@ -3,7 +3,6 @@
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-require 'msf/util/windows_registry_parser'
 require 'metasploit/framework/hashes/identify'
 
 class MetasploitModule < Msf::Auxiliary

modules/exploits/windows/browser/ie_unsafe_scripting.rb

@@ -3,7 +3,6 @@
 # Current source: https://github.com/rapid7/metasploit-framework
 ##
 
-require 'msf/util/exe'
 
 class MetasploitModule < Msf::Exploit::Remote
   Rank = ManualRanking

spec/lib/msf/util/document_generator/normalizer_spec.rb

@@ -1,6 +1,4 @@
 require 'rex'
-require 'msf/util/document_generator'
-require 'msf/util/document_generator/pull_request_finder'
 
 RSpec.describe Msf::Util::DocumentGenerator::DocumentNormalizer do
 

spec/lib/msf/util/document_generator/pull_request_finder_spec.rb

@@ -1,5 +1,4 @@
 require 'rex'
-require 'msf/util/document_generator'
 require 'octokit'
 require 'net/http'
 

spec/lib/msf/util/dot_net_deserialization_spec.rb

@@ -1,5 +1,4 @@
 require 'rex'
-require 'msf/util/dot_net_deserialization'
 
 RSpec.shared_examples 'a valid serialized stream' do |stream|
   it 'should start with a SerializedStreamHeader record' do

spec/lib/msf/util/java_deserialization_spec.rb

@@ -1,5 +1,4 @@
 require 'rex'
-require 'msf/util/java_deserialization'
 
 RSpec.describe Msf::Util::JavaDeserialization do
   let(:payload_name) do

tools/modules/update_payload_cached_sizes.rb

@@ -22,7 +22,6 @@ $:.unshift(ENV['MSF_LOCAL_LIB']) if ENV['MSF_LOCAL_LIB']
 gem 'rex-text'
 
 require 'rex'
-require 'msf/util/payload_cached_size'
 
 # Initialize the simplified framework instance.
 framework = Msf::Simple::Framework.create('DisableDatabase' => true)