Permalink
Browse files

Merge pull request #2291 from jdelStrother/load_missing_constant

Replace unnecessary regexp in Dependencies#load_missing_constant
  • Loading branch information...
2 parents 6089ecf + 43ef635 commit e4a7b23d382d9cf66771c0ce3eefe35c08e3711a @tenderlove tenderlove committed Jul 26, 2011
Showing with 1 addition and 2 deletions.
  1. +1 −2 activesupport/lib/active_support/dependencies.rb
@@ -466,7 +466,6 @@ def qualified_name_for(mod, name)
# Load the constant named +const_name+ which is missing from +from_mod+. If
# it is not possible to load the constant into from_mod, try its parent module
# using const_missing.
- THIS_FILE = %r{#{Regexp.escape(__FILE__)}}
def load_missing_constant(from_mod, const_name)
log_call from_mod, const_name
@@ -479,7 +478,7 @@ def load_missing_constant(from_mod, const_name)
qualified_name = qualified_name_for from_mod, const_name
path_suffix = qualified_name.underscore
- trace = caller.reject {|l| l =~ THIS_FILE}
+ trace = caller.reject {|l| l.starts_with? __FILE__ }
name_error = NameError.new("uninitialized constant #{qualified_name}")
name_error.set_backtrace(trace)

0 comments on commit e4a7b23

Please sign in to comment.