[Resolver] Update Molinillo

9 files changed, 2 insertions, 5 deletions

diff --git a/lib/bundler/vendor/Molinillo-smart-backtracking/lib/molinillo.rb b/lib/bundler/vendor/Molinillo-master/lib/molinillo.rb
index bf740e4848..bf740e4848 100644
--- a/lib/bundler/vendor/Molinillo-smart-backtracking/lib/molinillo.rb
+++ b/lib/bundler/vendor/Molinillo-master/lib/molinillo.rb
diff --git a/lib/bundler/vendor/Molinillo-smart-backtracking/lib/molinillo/dependency_graph.rb b/lib/bundler/vendor/Molinillo-master/lib/molinillo/dependency_graph.rb
index 53e09ac76b..53e09ac76b 100644
--- a/lib/bundler/vendor/Molinillo-smart-backtracking/lib/molinillo/dependency_graph.rb
+++ b/lib/bundler/vendor/Molinillo-master/lib/molinillo/dependency_graph.rb
diff --git a/lib/bundler/vendor/Molinillo-smart-backtracking/lib/molinillo/errors.rb b/lib/bundler/vendor/Molinillo-master/lib/molinillo/errors.rb
index b828d0c20d..b828d0c20d 100644
--- a/lib/bundler/vendor/Molinillo-smart-backtracking/lib/molinillo/errors.rb
+++ b/lib/bundler/vendor/Molinillo-master/lib/molinillo/errors.rb
diff --git a/lib/bundler/vendor/Molinillo-smart-backtracking/lib/molinillo/gem_metadata.rb b/lib/bundler/vendor/Molinillo-master/lib/molinillo/gem_metadata.rb
index 7c5a03faa9..7c5a03faa9 100644
--- a/lib/bundler/vendor/Molinillo-smart-backtracking/lib/molinillo/gem_metadata.rb
+++ b/lib/bundler/vendor/Molinillo-master/lib/molinillo/gem_metadata.rb
diff --git a/lib/bundler/vendor/Molinillo-smart-backtracking/lib/molinillo/modules/specification_provider.rb b/lib/bundler/vendor/Molinillo-master/lib/molinillo/modules/specification_provider.rb
index 79a85e778f..79a85e778f 100644
--- a/lib/bundler/vendor/Molinillo-smart-backtracking/lib/molinillo/modules/specification_provider.rb
+++ b/lib/bundler/vendor/Molinillo-master/lib/molinillo/modules/specification_provider.rb
diff --git a/lib/bundler/vendor/Molinillo-smart-backtracking/lib/molinillo/modules/ui.rb b/lib/bundler/vendor/Molinillo-master/lib/molinillo/modules/ui.rb
index fce3290d2f..fce3290d2f 100644
--- a/lib/bundler/vendor/Molinillo-smart-backtracking/lib/molinillo/modules/ui.rb
+++ b/lib/bundler/vendor/Molinillo-master/lib/molinillo/modules/ui.rb
diff --git a/lib/bundler/vendor/Molinillo-smart-backtracking/lib/molinillo/resolution.rb b/lib/bundler/vendor/Molinillo-master/lib/molinillo/resolution.rb
index 84d68d2f2d..a3f272539f 100644
--- a/lib/bundler/vendor/Molinillo-smart-backtracking/lib/molinillo/resolution.rb
+++ b/lib/bundler/vendor/Molinillo-master/lib/molinillo/resolution.rb
@@ -174,11 +174,8 @@ module Bundler::Molinillo
       # Unwinds the states stack because a conflict has been encountered
       # @return [void]
       def unwind_for_conflict
-        existing_state_index = state_index_for_unwind
         conflicts.tap do |c|
-          if existing_state_index
-            states.slice!(existing_state_index..-1)
-          end
+          states.slice!(state_index_for_unwind..-1)
           states.pop if state
           raise VersionConflict.new(c) unless state
           state.conflicts = c
@@ -196,7 +193,7 @@ module Bundler::Molinillo
               (!state.requirements.include?(requirement) && state.requirement != requirement)
             )
         end
-        index + 2 if index
+        index + 2
       end
 
       # @return [Conflict] a {Conflict} that reflects the failure to activate
diff --git a/lib/bundler/vendor/Molinillo-smart-backtracking/lib/molinillo/resolver.rb b/lib/bundler/vendor/Molinillo-master/lib/molinillo/resolver.rb
index 7cfe914d34..7cfe914d34 100644
--- a/lib/bundler/vendor/Molinillo-smart-backtracking/lib/molinillo/resolver.rb
+++ b/lib/bundler/vendor/Molinillo-master/lib/molinillo/resolver.rb
diff --git a/lib/bundler/vendor/Molinillo-smart-backtracking/lib/molinillo/state.rb b/lib/bundler/vendor/Molinillo-master/lib/molinillo/state.rb
index 8e394f8672..8e394f8672 100644
--- a/lib/bundler/vendor/Molinillo-smart-backtracking/lib/molinillo/state.rb
+++ b/lib/bundler/vendor/Molinillo-master/lib/molinillo/state.rb