Fixes #29177 - Fix Style/EachWithObject cop #748
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ekohl
reviewed
Feb 25, 2020
modules/dhcp_common/server.rb
Outdated
| @@ -185,7 +185,7 @@ def clean_up_add_record_parameters(in_options) | |||
| subnet = options.delete("network") | |||
|
|
|||
| # convert string keys to symbols | |||
| options = options.inject({}){|all, current| all[current[0].to_sym] = current[1]; all} | |||
| options = options.each_with_object({}){|current, all| all[current[0].to_sym] = current[1]; } | |||
There was a problem hiding this comment.
Suggested change
| options = options.each_with_object({}){|current, all| all[current[0].to_sym] = current[1]; } | |
| options = options.each_with_object({}){|current, all| all[current[0].to_sym] = current[1] } |
There was a problem hiding this comment.
Wait, itsnt this a change? It returned all, now it returns what?
There was a problem hiding this comment.
https://www.rubocop.org/en/stable/cops_style/#styleeachwithobject describes exactly this: "...without the need to return the object at the end."
| @@ -288,7 +286,7 @@ def sunw_option(option_id) | |||
| end | |||
|
|
|||
| def generate_sunw_options_by_id | |||
| SUNW.inject({}) { |all, current| all[current[1][:code]] = current[0]; all } | |||
| SUNW.each_with_object({}) { |current, all| all[current[1][:code]] = current[0]; } | |||
There was a problem hiding this comment.
Suggested change
| SUNW.each_with_object({}) { |current, all| all[current[1][:code]] = current[0]; } | |
| SUNW.each_with_object({}) { |current, all| all[current[1][:code]] = current[0] } |
| @@ -40,7 +40,7 @@ def test_initialize_plugins | |||
| assert all_but_uninitialized.all? {|p| p.has_key?(:di_container)} | |||
|
|
|||
| # filter out :di_container, can't use equality test with it | |||
| loaded = plugins.loaded.map {|p| [:name, :version, :class, :state, :http_enabled, :capabilities, :settings, :https_enabled].inject({}) {|a, c| a[c] = p[c]; a}} | |||
| loaded = plugins.loaded.map {|p| [:name, :version, :class, :state, :http_enabled, :capabilities, :settings, :https_enabled].each_with_object({}) {|c, a| a[c] = p[c]; }} | |||
There was a problem hiding this comment.
Suggested change
| loaded = plugins.loaded.map {|p| [:name, :version, :class, :state, :http_enabled, :capabilities, :settings, :https_enabled].each_with_object({}) {|c, a| a[c] = p[c]; }} | |
| loaded = plugins.loaded.map {|p| [:name, :version, :class, :state, :http_enabled, :capabilities, :settings, :https_enabled].each_with_object({}) {|c, a| a[c] = p[c] }} |
|
There's a semicolon cop... |
|
I'm kind of fan of keeping these changes small and not touch a line too much. |
|
Unfortunately, neither Rubocop nor Rubymine supports an auto-fix for semicolons of these one-liners. Anyway, should all be good now. |
ekohl
approved these changes
Mar 1, 2020
|
Leaving it open so @lzap can have another look. |
lzap
approved these changes
Mar 2, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.