Manually fix rubocop issues the automation didn't catch

Author: DavidS

lib/puppet/functions/stdlib/assert_private.rb

@@ -39,17 +39,17 @@ def default_impl(*args)
     raise(Puppet::ParseError, "assert_private(): Wrong number of arguments given (#{args.size}}) for 0 or 1)") if args.size > 1
 
     scope = self
-    if scope.lookupvar('module_name') != scope.lookupvar('caller_module_name')
-      message = nil
-      if args[0] && args[0].is_a?(String)
-        message = args[0]
-      else
-        manifest_name = scope.source.name
-        manifest_type = scope.source.type
-        message = (manifest_type.to_s == 'hostclass') ? 'Class' : 'Definition'
-        message += " #{manifest_name} is private"
-      end
-      raise(Puppet::ParseError, message)
+    return unless scope.lookupvar('module_name') != scope.lookupvar('caller_module_name')
+
+    message = nil
+    if args[0] && args[0].is_a?(String)
+      message = args[0]
+    else
+      manifest_name = scope.source.name
+      manifest_type = scope.source.type
+      message = (manifest_type.to_s == 'hostclass') ? 'Class' : 'Definition'
+      message += " #{manifest_name} is private"
     end
+    raise(Puppet::ParseError, message)
   end
 end

lib/puppet/functions/stdlib/deprecation.rb

@@ -42,8 +42,6 @@ def default_impl(*arguments)
     key = arguments[0]
     message = arguments[1]
 
-    if ENV['STDLIB_LOG_DEPRECATIONS'] == 'true'
-      warning("deprecation. #{key}. #{message}")
-    end
+    warning("deprecation. #{key}. #{message}") if ENV['STDLIB_LOG_DEPRECATIONS'] == 'true'
   end
 end