summaryrefslogtreecommitdiff
path: root/lib/bundler/definition.rb
diff options
context:
space:
mode:
authorDavid Rodríguez <deivid.rodriguez@riseup.net>2019-06-26 16:42:38 +0200
committerHiroshi SHIBATA <hsbt@ruby-lang.org>2019-08-03 09:29:56 +0900
commited37de1c8201a00eeb40468543313f078469e6af (patch)
tree372fc4a60b1aadf907cee4af0acf40c82fe49824 /lib/bundler/definition.rb
parentbdcd1990adbbbdb7baa26ca7a0fd6e56efb05143 (diff)
[bundler/bundler] Inline `expanded_deps`
It's now only used once, and doing it like this is consistent with the previous line. https://github.com/bundler/bundler/commit/7d27330fc7
Diffstat (limited to 'lib/bundler/definition.rb')
-rw-r--r--lib/bundler/definition.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/bundler/definition.rb b/lib/bundler/definition.rb
index 079f3ddbb5..339c38ab72 100644
--- a/lib/bundler/definition.rb
+++ b/lib/bundler/definition.rb
@@ -812,9 +812,8 @@ module Bundler
end
resolve = SpecSet.new(converged)
- expanded_deps = expand_dependencies(deps, true)
@locked_specs_incomplete_for_platform = !resolve.for(expand_dependencies(deps), @unlock[:gems], true, true)
- resolve = resolve.for(expanded_deps, @unlock[:gems], false, false, false)
+ resolve = resolve.for(expand_dependencies(deps, true), @unlock[:gems], false, false, false)
diff = nil
# Now, we unlock any sources that do not have anymore gems pinned to it