From 1faf619813e0e349161e3917028b06107f01e935 Mon Sep 17 00:00:00 2001 From: Hartley McGuire Date: Mon, 14 Mar 2022 21:39:53 -0400 Subject: [PATCH] remove extra core_ext/object/blank requires activerecord/lib/active_record/connection_adapters/postgresql/column.rb - usage added in 64fd666 - unneeded because of active_support/rails: 8f58d6e railties/lib/rails/rack/logger.rb - usage added in c83d9a1 - usage removed in c131211 activesupport/lib/active_support/number_helper/number_converter.rb - the NumberHelper was split into multiple classes in 2da9d67, however the require was left in NumberConverter even though NumberToPhoneConverter is the only class where it's used activesupport/lib/active_support/duration/iso8601_serializer.rb - usage added in 04c512d - usage removed in 51e991f --- .../lib/active_record/connection_adapters/postgresql/column.rb | 2 -- activesupport/lib/active_support/duration/iso8601_serializer.rb | 2 -- .../lib/active_support/number_helper/number_converter.rb | 1 - .../active_support/number_helper/number_to_phone_converter.rb | 1 + railties/lib/rails/rack/logger.rb | 1 - 5 files changed, 1 insertion(+), 6 deletions(-) diff --git a/activerecord/lib/active_record/connection_adapters/postgresql/column.rb b/activerecord/lib/active_record/connection_adapters/postgresql/column.rb index 192f15ea58bb1..3bf1ee6db4215 100644 --- a/activerecord/lib/active_record/connection_adapters/postgresql/column.rb +++ b/activerecord/lib/active_record/connection_adapters/postgresql/column.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require "active_support/core_ext/object/blank" - module ActiveRecord module ConnectionAdapters module PostgreSQL diff --git a/activesupport/lib/active_support/duration/iso8601_serializer.rb b/activesupport/lib/active_support/duration/iso8601_serializer.rb index 9353c649b4706..8c402040cf0cb 100644 --- a/activesupport/lib/active_support/duration/iso8601_serializer.rb +++ b/activesupport/lib/active_support/duration/iso8601_serializer.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -require "active_support/core_ext/object/blank" - module ActiveSupport class Duration # Serializes duration to string according to ISO 8601 Duration format. diff --git a/activesupport/lib/active_support/number_helper/number_converter.rb b/activesupport/lib/active_support/number_helper/number_converter.rb index 168b1a5429d2d..1040208fb1c77 100644 --- a/activesupport/lib/active_support/number_helper/number_converter.rb +++ b/activesupport/lib/active_support/number_helper/number_converter.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require "active_support/core_ext/big_decimal/conversions" -require "active_support/core_ext/object/blank" require "active_support/core_ext/hash/keys" require "active_support/i18n" require "active_support/core_ext/class/attribute" diff --git a/activesupport/lib/active_support/number_helper/number_to_phone_converter.rb b/activesupport/lib/active_support/number_helper/number_to_phone_converter.rb index c9771d0a09514..d104449ab790f 100644 --- a/activesupport/lib/active_support/number_helper/number_to_phone_converter.rb +++ b/activesupport/lib/active_support/number_helper/number_to_phone_converter.rb @@ -1,5 +1,6 @@ # frozen_string_literal: true +require "active_support/core_ext/object/blank" require "active_support/number_helper/number_converter" module ActiveSupport diff --git a/railties/lib/rails/rack/logger.rb b/railties/lib/rails/rack/logger.rb index a2518a052d1b6..cbf9e1b3c0d89 100644 --- a/railties/lib/rails/rack/logger.rb +++ b/railties/lib/rails/rack/logger.rb @@ -1,7 +1,6 @@ # frozen_string_literal: true require "active_support/core_ext/time/conversions" -require "active_support/core_ext/object/blank" require "active_support/log_subscriber" require "rack/body_proxy"