Skip to content

Commit 3c78efc

Browse files
authored
[V2] Ruby2.7 warns on Proc.new with no block (#2061)
* Ruby2.7 warns on Proc.new with no block * [ci skip] changelog
1 parent bad42ab commit 3c78efc

File tree

8 files changed

+12
-10
lines changed

8 files changed

+12
-10
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
Unreleased Changes
22
------------------
33

4+
* Issue - Mirgate Proc.new without a block usage #2058.
5+
46
2.11.285 (2019-05-30)
57
------------------
68

aws-sdk-core/lib/aws-sdk-core.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -555,7 +555,7 @@ def sub_modules(options = {})
555555
# each new service added after the callback is registered.
556556
# @api private
557557
def service_added(&block)
558-
callback = Proc.new
558+
callback = block if block_given?
559559
@services.each do |svc_name, (svc_module, options)|
560560
yield(svc_name, svc_module, options)
561561
end

aws-sdk-core/lib/aws-sdk-core/waiters/waiter.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ def initialize(options = {})
4949
#
5050
# @yieldparam [Integer] attempts The number of attempts made.
5151
def before_attempt(&block)
52-
@before_attempt << Proc.new
52+
@before_attempt << block if block_given?
5353
end
5454

5555
# Register a callback that is invoked after an attempt but before
@@ -80,7 +80,7 @@ def before_attempt(&block)
8080
# @yieldparam [Seahorse::Client::Response] response The response from
8181
# the previous polling attempts.
8282
def before_wait(&block)
83-
@before_wait << Proc.new
83+
@before_wait << block if block_given?
8484
end
8585

8686
# @option options [Client] :client

aws-sdk-core/lib/seahorse/client/configuration.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ def initialize
104104
#
105105
# @return [self]
106106
def add_option(name, default = nil, &block)
107-
default = DynamicDefault.new(Proc.new) if block_given?
107+
default = DynamicDefault.new(block) if block_given?
108108
@defaults[name.to_sym] << default
109109
self
110110
end

aws-sdk-core/lib/seahorse/client/events.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ def initialize(*args)
99

1010
def emit(event_name, *args, &block)
1111
@listeners[event_name] ||= []
12-
@listeners[event_name] << Proc.new
12+
@listeners[event_name] << block if block_given?
1313
end
1414

1515
def signal(event, *args)

aws-sdk-core/lib/seahorse/client/http/response.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -117,15 +117,15 @@ def signal_error(networking_error)
117117
end
118118

119119
def on_headers(status_code_range = nil, &block)
120-
@listeners[:headers] << listener(status_code_range, Proc.new)
120+
@listeners[:headers] << listener(status_code_range, block)
121121
end
122122

123123
def on_data(&callback)
124-
@listeners[:data] << Proc.new
124+
@listeners[:data] << callback
125125
end
126126

127127
def on_done(status_code_range = nil, &callback)
128-
listener = listener(status_code_range, Proc.new)
128+
listener = listener(status_code_range, callback)
129129
if @done
130130
listener.call
131131
else

aws-sdk-core/lib/seahorse/client/plugin.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class << self
4040

4141
def option(name, default = nil, &block)
4242
if block_given?
43-
options << [[name], Proc.new]
43+
options << [[name], block]
4444
else
4545
options << [[name, default]]
4646
end

aws-sdk-resources/lib/aws-sdk-resources/services/sqs/queue_poller.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ def initialize(queue_url, options = {})
253253
#
254254
# @return [void]
255255
def before_request(&block)
256-
@default_config = @default_config.with(before_request: Proc.new)
256+
@default_config = @default_config.with(before_request: block) if block_given?
257257
end
258258

259259
# Polls the queue, yielded a message, or an array of messages.

0 commit comments

Comments
 (0)