2 files changed, 145 insertions, 0 deletions
diff --git a/lib/rubygems/vendor/molinillo/lib/molinillo/delegates/resolution_state.rb b/lib/rubygems/vendor/molinillo/lib/molinillo/delegates/resolution_state.rb
new file mode 100644
index 0000000000..34842d46d5
--- /dev/null
+++ b/lib/rubygems/vendor/molinillo/lib/molinillo/delegates/resolution_state.rb
@@ -0,0 +1,57 @@
+# frozen_string_literal: true
+
+module Gem::Molinillo
+  # @!visibility private
+  module Delegates
+    # Delegates all {Gem::Molinillo::ResolutionState} methods to a `#state` property.
+    module ResolutionState
+      # (see Gem::Molinillo::ResolutionState#name)
+      def name
+        current_state = state || Gem::Molinillo::ResolutionState.empty
+        current_state.name
+      end
+
+      # (see Gem::Molinillo::ResolutionState#requirements)
+      def requirements
+        current_state = state || Gem::Molinillo::ResolutionState.empty
+        current_state.requirements
+      end
+
+      # (see Gem::Molinillo::ResolutionState#activated)
+      def activated
+        current_state = state || Gem::Molinillo::ResolutionState.empty
+        current_state.activated
+      end
+
+      # (see Gem::Molinillo::ResolutionState#requirement)
+      def requirement
+        current_state = state || Gem::Molinillo::ResolutionState.empty
+        current_state.requirement
+      end
+
+      # (see Gem::Molinillo::ResolutionState#possibilities)
+      def possibilities
+        current_state = state || Gem::Molinillo::ResolutionState.empty
+        current_state.possibilities
+      end
+
+      # (see Gem::Molinillo::ResolutionState#depth)
+      def depth
+        current_state = state || Gem::Molinillo::ResolutionState.empty
+        current_state.depth
+      end
+
+      # (see Gem::Molinillo::ResolutionState#conflicts)
+      def conflicts
+        current_state = state || Gem::Molinillo::ResolutionState.empty
+        current_state.conflicts
+      end
+
+      # (see Gem::Molinillo::ResolutionState#unused_unwind_options)
+      def unused_unwind_options
+        current_state = state || Gem::Molinillo::ResolutionState.empty
+        current_state.unused_unwind_options
+      end
+    end
+  end
+end
diff --git a/lib/rubygems/vendor/molinillo/lib/molinillo/delegates/specification_provider.rb b/lib/rubygems/vendor/molinillo/lib/molinillo/delegates/specification_provider.rb
new file mode 100644
index 0000000000..8417721537
--- /dev/null
+++ b/lib/rubygems/vendor/molinillo/lib/molinillo/delegates/specification_provider.rb
@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+module Gem::Molinillo
+  module Delegates
+    # Delegates all {Gem::Molinillo::SpecificationProvider} methods to a
+    # `#specification_provider` property.
+    module SpecificationProvider
+      # (see Gem::Molinillo::SpecificationProvider#search_for)
+      def search_for(dependency)
+        with_no_such_dependency_error_handling do
+          specification_provider.search_for(dependency)
+        end
+      end
+
+      # (see Gem::Molinillo::SpecificationProvider#dependencies_for)
+      def dependencies_for(specification)
+        with_no_such_dependency_error_handling do
+          specification_provider.dependencies_for(specification)
+        end
+      end
+
+      # (see Gem::Molinillo::SpecificationProvider#requirement_satisfied_by?)
+      def requirement_satisfied_by?(requirement, activated, spec)
+        with_no_such_dependency_error_handling do
+          specification_provider.requirement_satisfied_by?(requirement, activated, spec)
+        end
+      end
+
+      # (see Gem::Molinillo::SpecificationProvider#dependencies_equal?)
+      def dependencies_equal?(dependencies, other_dependencies)
+        with_no_such_dependency_error_handling do
+          specification_provider.dependencies_equal?(dependencies, other_dependencies)
+        end
+      end
+
+      # (see Gem::Molinillo::SpecificationProvider#name_for)
+      def name_for(dependency)
+        with_no_such_dependency_error_handling do
+          specification_provider.name_for(dependency)
+        end
+      end
+
+      # (see Gem::Molinillo::SpecificationProvider#name_for_explicit_dependency_source)
+      def name_for_explicit_dependency_source
+        with_no_such_dependency_error_handling do
+          specification_provider.name_for_explicit_dependency_source
+        end
+      end
+
+      # (see Gem::Molinillo::SpecificationProvider#name_for_locking_dependency_source)
+      def name_for_locking_dependency_source
+        with_no_such_dependency_error_handling do
+          specification_provider.name_for_locking_dependency_source
+        end
+      end
+
+      # (see Gem::Molinillo::SpecificationProvider#sort_dependencies)
+      def sort_dependencies(dependencies, activated, conflicts)
+        with_no_such_dependency_error_handling do
+          specification_provider.sort_dependencies(dependencies, activated, conflicts)
+        end
+      end
+
+      # (see Gem::Molinillo::SpecificationProvider#allow_missing?)
+      def allow_missing?(dependency)
+        with_no_such_dependency_error_handling do
+          specification_provider.allow_missing?(dependency)
+        end
+      end
+
+      private
+
+      # Ensures any raised {NoSuchDependencyError} has its
+      # {NoSuchDependencyError#required_by} set.
+      # @yield
+      def with_no_such_dependency_error_handling
+        yield
+      rescue NoSuchDependencyError => error
+        if state
+          vertex = activated.vertex_named(name_for(error.dependency))
+          error.required_by += vertex.incoming_edges.map { |e| e.origin.name }
+          error.required_by << name_for_explicit_dependency_source unless vertex.explicit_requirements.empty?
+        end
+        raise
+      end
+    end
+  end
+end