Adjust semantics of Formula#fetch

It doesn't really make logical sense that this method returns both the
fetched path (or sometimes nil!) and the downloader, so just return the
path (again, or nil!) and callers that want the downloader can ask for
it separately.

1 files changed, 3 insertions, 3 deletions

diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb
index dafb18ed0..53aec6dcf 100644
--- a/Library/Homebrew/formula.rb
+++ b/Library/Homebrew/formula.rb
@@ -618,7 +618,7 @@ class Formula
   def fetch
     # Ensure the cache exists
     HOMEBREW_CACHE.mkpath
-    return downloader.fetch, downloader
+    downloader.fetch
   end
 
   # For FormulaInstaller.
@@ -643,8 +643,8 @@ class Formula
   private
 
   def stage
-    fetched, downloader = fetch
-    verify_download_integrity fetched if fetched.kind_of? Pathname
+    fetched = fetch
+    verify_download_integrity(fetched) if fetched.kind_of? Pathname
     mktemp do
       downloader.stage
       # Set path after the downloader changes the working folder.