aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib/rails/autoloaders.rb
diff options
context:
space:
mode:
Diffstat (limited to 'railties/lib/rails/autoloaders.rb')
-rw-r--r--railties/lib/rails/autoloaders.rb15
1 files changed, 11 insertions, 4 deletions
diff --git a/railties/lib/rails/autoloaders.rb b/railties/lib/rails/autoloaders.rb
index 4b41e1faf9..1bd3f18a74 100644
--- a/railties/lib/rails/autoloaders.rb
+++ b/railties/lib/rails/autoloaders.rb
@@ -1,5 +1,7 @@
# frozen_string_literal: true
+require "active_support/dependencies/zeitwerk_integration"
+
module Rails
module Autoloaders # :nodoc:
class << self
@@ -7,13 +9,19 @@ module Rails
def main
if zeitwerk_enabled?
- @main ||= Zeitwerk::Loader.new.tap { |loader| loader.tag = "rails.main" }
+ @main ||= Zeitwerk::Loader.new.tap do |loader|
+ loader.tag = "rails.main"
+ loader.inflector = ActiveSupport::Dependencies::ZeitwerkIntegration::Inflector
+ end
end
end
def once
if zeitwerk_enabled?
- @once ||= Zeitwerk::Loader.new.tap { |loader| loader.tag = "rails.once" }
+ @once ||= Zeitwerk::Loader.new.tap do |loader|
+ loader.tag = "rails.once"
+ loader.inflector = ActiveSupport::Dependencies::ZeitwerkIntegration::Inflector
+ end
end
end
@@ -25,8 +33,7 @@ module Rails
end
def logger=(logger)
- callable_or_nil = logger.respond_to?(:debug) ? logger.method(:debug) : logger
- each { |loader| loader.logger = callable_or_nil }
+ each { |loader| loader.logger = logger }
end
def zeitwerk_enabled?