From 404a9bc88be538769c6c80b3b31f39a6582991d2 Mon Sep 17 00:00:00 2001 From: Lamont Granquist Date: Mon, 13 Feb 2017 09:52:10 -0800 Subject: fix specs: RedundantReturn, RedundantSelf, RedundantBegin department of redundancy department Signed-off-by: Lamont Granquist --- lib/chef/node/common_api.rb | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'lib/chef/node/common_api.rb') diff --git a/lib/chef/node/common_api.rb b/lib/chef/node/common_api.rb index c9786807e9..a703c1ef54 100644 --- a/lib/chef/node/common_api.rb +++ b/lib/chef/node/common_api.rb @@ -24,7 +24,7 @@ class Chef # method-style access to attributes def valid_container?(obj, key) - return obj.is_a?(Hash) || (obj.is_a?(Array) && key.is_a?(Integer)) + obj.is_a?(Hash) || (obj.is_a?(Array) && key.is_a?(Integer)) end private :valid_container? @@ -85,16 +85,14 @@ class Chef end end end - return true + true end # this is a safe non-autovivifying reader that returns nil if the attribute does not exist def read(*path) - begin - read!(*path) - rescue Chef::Exceptions::NoSuchAttribute - nil - end + read!(*path) + rescue Chef::Exceptions::NoSuchAttribute + nil end # non-autovivifying reader that throws an exception if the attribute does not exist -- cgit v1.2.1