From 1165401ee962aef0aaf81080e3e7dcab522efa40 Mon Sep 17 00:00:00 2001 From: Ryuta Kamizono Date: Sun, 10 May 2020 03:20:02 +0900 Subject: [PATCH] Remove unused `require "active_support/core_ext/kernel/singleton_class"` `singleton_class` is in Ruby 1.9.2, and there is no use singleton class eval in the files. --- actionpack/lib/action_dispatch/testing/integration.rb | 1 - actionview/lib/action_view/template.rb | 1 - activerecord/lib/active_record/scoping/named.rb | 1 - activesupport/lib/active_support/core_ext/class/attribute.rb | 1 - .../lib/active_support/core_ext/string/output_safety.rb | 1 - .../lib/active_support/deprecation/instance_delegator.rb | 1 - railties/lib/rails/generators.rb | 1 - 7 files changed, 7 deletions(-) diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb index bb6c170afd..1aef36d0cd 100644 --- a/actionpack/lib/action_dispatch/testing/integration.rb +++ b/actionpack/lib/action_dispatch/testing/integration.rb @@ -2,7 +2,6 @@ require "stringio" require "uri" -require "active_support/core_ext/kernel/singleton_class" require "rack/test" require "minitest" diff --git a/actionview/lib/action_view/template.rb b/actionview/lib/action_view/template.rb index c753c2bbb0..cf0ef74959 100644 --- a/actionview/lib/action_view/template.rb +++ b/actionview/lib/action_view/template.rb @@ -1,6 +1,5 @@ # frozen_string_literal: true -require "active_support/core_ext/kernel/singleton_class" require "thread" require "delegate" diff --git a/activerecord/lib/active_record/scoping/named.rb b/activerecord/lib/active_record/scoping/named.rb index 8ffdadae54..b1fc982f72 100644 --- a/activerecord/lib/active_record/scoping/named.rb +++ b/activerecord/lib/active_record/scoping/named.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require "active_support/core_ext/array" -require "active_support/core_ext/kernel/singleton_class" module ActiveRecord # = Active Record \Named \Scopes diff --git a/activesupport/lib/active_support/core_ext/class/attribute.rb b/activesupport/lib/active_support/core_ext/class/attribute.rb index 80a1955bed..25fd3780f0 100644 --- a/activesupport/lib/active_support/core_ext/class/attribute.rb +++ b/activesupport/lib/active_support/core_ext/class/attribute.rb @@ -1,6 +1,5 @@ # frozen_string_literal: true -require "active_support/core_ext/kernel/singleton_class" require "active_support/core_ext/module/redefine_method" require "active_support/core_ext/array/extract_options" diff --git a/activesupport/lib/active_support/core_ext/string/output_safety.rb b/activesupport/lib/active_support/core_ext/string/output_safety.rb index d35ba40d53..635f9cf457 100644 --- a/activesupport/lib/active_support/core_ext/string/output_safety.rb +++ b/activesupport/lib/active_support/core_ext/string/output_safety.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require "erb" -require "active_support/core_ext/kernel/singleton_class" require "active_support/core_ext/module/redefine_method" require "active_support/multibyte/unicode" diff --git a/activesupport/lib/active_support/deprecation/instance_delegator.rb b/activesupport/lib/active_support/deprecation/instance_delegator.rb index 8beda373a2..59dd30ae30 100644 --- a/activesupport/lib/active_support/deprecation/instance_delegator.rb +++ b/activesupport/lib/active_support/deprecation/instance_delegator.rb @@ -1,6 +1,5 @@ # frozen_string_literal: true -require "active_support/core_ext/kernel/singleton_class" require "active_support/core_ext/module/delegation" module ActiveSupport diff --git a/railties/lib/rails/generators.rb b/railties/lib/rails/generators.rb index 6f6a664e6f..a864017576 100644 --- a/railties/lib/rails/generators.rb +++ b/railties/lib/rails/generators.rb @@ -6,7 +6,6 @@ $:.unshift(activesupport_path) if File.directory?(activesupport_path) && !$:.inc require "thor/group" require "rails/command" -require "active_support/core_ext/kernel/singleton_class" require "active_support/core_ext/array/extract_options" require "active_support/core_ext/enumerable" require "active_support/core_ext/hash/deep_merge"