Faidon Liambotis has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/359450 )
Change subject: wmflib/to_milliseconds: fix two minor RuboCop cops
......................................................................
wmflib/to_milliseconds: fix two minor RuboCop cops
Style/ParallelAssignment and Style/PerlBackrefs.
Change-Id: I2b74222982428dcad5bfcbc29802b4ee7f97b5e2
---
M .rubocop_todo.yml
M modules/wmflib/lib/puppet/parser/functions/to_milliseconds.rb
2 files changed, 1 insertion(+), 10 deletions(-)
Approvals:
Faidon Liambotis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
index aa1f615..636bb27 100644
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -79,14 +79,6 @@
Exclude:
- 'modules/graphite/lib/puppet/parser/functions/configparser_format.rb'
-Style/ParallelAssignment:
- Exclude:
- - 'modules/wmflib/lib/puppet/parser/functions/to_milliseconds.rb'
-
-Style/PerlBackrefs:
- Exclude:
- - 'modules/wmflib/lib/puppet/parser/functions/to_milliseconds.rb'
-
Style/RedundantReturn:
Exclude:
- 'modules/graphite/lib/puppet/parser/functions/configparser_format.rb'
diff --git a/modules/wmflib/lib/puppet/parser/functions/to_milliseconds.rb
b/modules/wmflib/lib/puppet/parser/functions/to_milliseconds.rb
index 2421afe..0c0b663 100644
--- a/modules/wmflib/lib/puppet/parser/functions/to_milliseconds.rb
+++ b/modules/wmflib/lib/puppet/parser/functions/to_milliseconds.rb
@@ -12,8 +12,7 @@
module Puppet::Parser::Functions
newfunction(:to_milliseconds, :type => :rvalue, :arity => 1) do |args|
time_spec = args.first
- /^([0-9.+e]+)\s*(.*).?$/ =~ time_spec.downcase
- count, unit = $1, $2
+ /^(?<count>[0-9.+e]+)\s*(?<unit>.*).?$/ =~ time_spec.downcase
factor = case unit
when /^n/ then 1.0e-6 # nanoseconds
when /^u/ then 1.0e-3 # microseconds
--
To view, visit https://gerrit.wikimedia.org/r/359450
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2b74222982428dcad5bfcbc29802b4ee7f97b5e2
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Faidon Liambotis <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
