Merge branch 'master' into mkdir_with_intermediates

1 files changed, 2 insertions, 4 deletions

diff --git a/Library/Homebrew/descriptions.rb b/Library/Homebrew/descriptions.rb
index 5e7a5b06c..0ef4316d3 100644
--- a/Library/Homebrew/descriptions.rb
+++ b/Library/Homebrew/descriptions.rb
@@ -12,9 +12,7 @@ class Descriptions
   # If the cache file exists, load it into, and return, a hash; otherwise,
   # return nil.
   def self.load_cache
-    if CACHE_FILE.exist?
-      @cache = Utils::JSON.load(CACHE_FILE.read)
-    end
+    @cache = Utils::JSON.load(CACHE_FILE.read) if CACHE_FILE.exist?
   end
 
   # Write the cache to disk after ensuring the existence of the containing
@@ -138,6 +136,6 @@ class Descriptions
 
   def short_name_counts
     @short_name_counts ||=
-      short_names.values.each_with_object(Hash.new(0)) { |name, counts| counts[name] += 1; counts }
+      short_names.values.each_with_object(Hash.new(0)) { |name, counts| counts[name] += 1 }
   end
 end