summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Giddins <segiddins@segiddins.me>2015-11-26 12:35:57 -0600
committerSamuel Giddins <segiddins@segiddins.me>2015-11-26 12:35:57 -0600
commit831457dd8f9c991b06703c3ad24a8840586e41ec (patch)
tree55a9419f7cefe8471e2bef45280aef2c79ee34ad
parent69832acfd333267d1bedc6b2467e5c0f0c1c67e1 (diff)
downloadbundler-831457dd8f9c991b06703c3ad24a8840586e41ec.tar.gz
[RuboCop] Enable Style/EmptyElse
-rw-r--r--.rubocop_todo.yml8
-rw-r--r--lib/bundler/fetcher.rb2
-rw-r--r--lib/bundler/ruby_version.rb2
3 files changed, 0 insertions, 12 deletions
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index 7fa5daf6c7..65707ff2c4 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -83,14 +83,6 @@ Style/ClassAndModuleChildren:
Style/Documentation:
Enabled: false
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/EmptyElse:
- Exclude:
- - 'lib/bundler/fetcher.rb'
- - 'lib/bundler/ruby_version.rb'
-
# Offense count: 10
# Cop supports --auto-correct.
# Configuration parameters: EnforcedStyle, SupportedStyles.
diff --git a/lib/bundler/fetcher.rb b/lib/bundler/fetcher.rb
index aa3e4dedf9..abb252971c 100644
--- a/lib/bundler/fetcher.rb
+++ b/lib/bundler/fetcher.rb
@@ -180,8 +180,6 @@ module Bundler
def http_proxy
if uri = connection.proxy_uri
uri.to_s
- else
- nil
end
end
diff --git a/lib/bundler/ruby_version.rb b/lib/bundler/ruby_version.rb
index 138262e3db..34268c79f2 100644
--- a/lib/bundler/ruby_version.rb
+++ b/lib/bundler/ruby_version.rb
@@ -53,8 +53,6 @@ module Bundler
[:engine_version, engine_version, other.engine_version]
elsif patchlevel != other.patchlevel && @patchlevel
[:patchlevel, patchlevel, other.patchlevel]
- else
- nil
end
end