Skip to content

Commit

Permalink
Fix comments relating to taint/untaint removal.
Browse files Browse the repository at this point in the history
  • Loading branch information
philr committed Mar 7, 2020
1 parent 0a0a75b commit b6b0f77
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion lib/tzinfo.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ module TZInfo
end

# Object#untaint is a deprecated no-op in Ruby >= 2.7 and will be removed in
# 3.0. Add a refinement to either silence the warning, or supply the method if
# 3.2. Add a refinement to either silence the warning, or supply the method if
# needed.
o = Object.new
if [:taint, :untaint, :tainted?].none? {|m| o.respond_to?(m) } || RUBY_VERSION =~ /\A(\d+)\.(\d+)(?:\.|\z)/ && ($1 == '2' && $2.to_i >= 7 || $1.to_i >= 3)
Expand Down
2 changes: 1 addition & 1 deletion lib/tzinfo/untaint_ext.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# frozen_string_literal: true

module TZInfo
# Object#untaint is deprecated in Ruby >= 2.7 and will be removed in 3.0.
# Object#untaint is deprecated in Ruby >= 2.7 and will be removed in 3.2.
# UntaintExt adds a refinement to make Object#untaint a no-op and avoid the
# warning.
#
Expand Down
2 changes: 1 addition & 1 deletion test/test_utils.rb
Original file line number Diff line number Diff line change
Expand Up @@ -495,7 +495,7 @@ def assert_equal_with_offset_and_class(expected, actual)
end

# Object#taint is a deprecated no-op in Ruby 2.7 and outputs a warning. It
# will be removed in 3.0. Silence the warning or supply a replacement.
# will be removed in 3.2. Silence the warning or supply a replacement.
if TZInfo.const_defined?(:UntaintExt)
module TaintExt
refine Object do
Expand Down

0 comments on commit b6b0f77

Please sign in to comment.