summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorduerst <duerst@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-05-02 05:46:31 +0000
committerduerst <duerst@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-05-02 05:46:31 +0000
commit107f15728973488ce54bf299751d28236f75a8f4 (patch)
tree0ea0e0612f77d3b5fa898895e114b309fc5d0050
parent8001dae8208ef3c3eedc09776c1efd3c74bf0b6a (diff)
remove unnecessary conditions in lib/unicode_normalize.rb
Because the methods in lib/unicode_normalize.rb are overwritten by those in lib/unicode_normalize/normalize.rb as soon as one of them is called, the check for whether UnicodeNormalized is defined or not is no longer necessary. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58539 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--lib/unicode_normalize.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/unicode_normalize.rb b/lib/unicode_normalize.rb
index e87677eb68..0630b8627e 100644
--- a/lib/unicode_normalize.rb
+++ b/lib/unicode_normalize.rb
@@ -30,7 +30,7 @@ class String
# #=> Encoding::CompatibilityError raised
#
def unicode_normalize(form = :nfc)
- require 'unicode_normalize/normalize.rb' unless defined? UnicodeNormalize
+ require 'unicode_normalize/normalize.rb'
unicode_normalize form # no recursion, because redefined in unicode_normalize/normalize.rb
end
@@ -41,7 +41,7 @@ class String
# normalization in place.
#
def unicode_normalize!(form = :nfc)
- require 'unicode_normalize/normalize.rb' unless defined? UnicodeNormalize
+ require 'unicode_normalize/normalize.rb'
unicode_normalize! form
end
@@ -63,7 +63,7 @@ class String
# #=> Encoding::CompatibilityError raised
#
def unicode_normalized?(form = :nfc)
- require 'unicode_normalize/normalize.rb' unless defined? UnicodeNormalize
+ require 'unicode_normalize/normalize.rb'
unicode_normalized? form
end
end