summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authork0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-05-20 16:20:07 +0000
committerk0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-05-20 16:20:07 +0000
commita6986f10d037a8ca5bee4416ad5f22c03b4ef930 (patch)
tree704e29ce7db9a709bc80da0acbd21079896a8d32 /lib
parent9aa33d5ddf2069bc0e455a666c3b2fbb4c609388 (diff)
erb.rb: Prevent potential unexpected rescue
of LoadError in some method calls, not from `require "strscan"`. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@58822 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/erb.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/erb.rb b/lib/erb.rb
index 3ff64cbb3d..b1c993c001 100644
--- a/lib/erb.rb
+++ b/lib/erb.rb
@@ -501,6 +501,8 @@ class ERB
begin
require 'strscan'
+ rescue LoadError
+ else
class SimpleScanner < Scanner # :nodoc:
def scan
stag_reg = /(.*?)(#{stags.join('|')}|\z)/m
@@ -540,8 +542,6 @@ class ERB
end
end
Scanner.regist_scanner(ExplicitScanner, '-', false)
-
- rescue LoadError
end
class Buffer # :nodoc: