diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2016-02-23 10:45:15 -0800 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2016-02-23 10:45:15 -0800 |
| commit | 271d3e4f91e3d158c9112512ac75d0ca51fc928d (patch) | |
| tree | 5beb5e5588db43ecac46f38725cabf5e573fd1d6 /lib/chef/mixin/properties.rb | |
| parent | aa7e0e05395823c66b30f1a810d1720aea3b6d72 (diff) | |
| download | chef-271d3e4f91e3d158c9112512ac75d0ca51fc928d.tar.gz | |
Autofixing new Perf cops in 0.37.2
6 Performance/Casecmp
18 Performance/Detect
1 Performance/RangeInclude
27 Performance/RedundantBlockCall
6 Performance/RedundantMatch
5 Performance/RedundantMerge
18 Performance/StringReplacement
Diffstat (limited to 'lib/chef/mixin/properties.rb')
| -rw-r--r-- | lib/chef/mixin/properties.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/chef/mixin/properties.rb b/lib/chef/mixin/properties.rb index 2e33d2d0e7..1ee16b8b4a 100644 --- a/lib/chef/mixin/properties.rb +++ b/lib/chef/mixin/properties.rb @@ -98,7 +98,8 @@ class Chef options.each { |k, v| options[k.to_sym] = v if k.is_a?(String) } options[:instance_variable_name] = :"@#{name}" if !options.has_key?(:instance_variable_name) - options.merge!(name: name, declared_in: self) + options[:name] = name + options[:declared_in] = self if type == NOT_PASSED # If a type is not passed, the property derives from the |