From cead2dd1f4e40eb21270b4a6112645a59ce89088 Mon Sep 17 00:00:00 2001 From: Sergey Nartimov Date: Wed, 18 Jan 2012 05:01:09 +0300 Subject: remove unused requires --- activesupport/lib/active_support/buffered_logger.rb | 3 --- activesupport/lib/active_support/configurable.rb | 2 -- 2 files changed, 5 deletions(-) diff --git a/activesupport/lib/active_support/buffered_logger.rb b/activesupport/lib/active_support/buffered_logger.rb index 36e29644c6..0595446189 100644 --- a/activesupport/lib/active_support/buffered_logger.rb +++ b/activesupport/lib/active_support/buffered_logger.rb @@ -1,8 +1,5 @@ -require 'thread' -require 'active_support/core_ext/class/attribute_accessors' require 'active_support/deprecation' require 'active_support/logger' -require 'fileutils' module ActiveSupport BufferedLogger = ActiveSupport::Deprecation::DeprecatedConstantProxy.new( diff --git a/activesupport/lib/active_support/configurable.rb b/activesupport/lib/active_support/configurable.rb index a2d2719de7..a8aa53a80f 100644 --- a/activesupport/lib/active_support/configurable.rb +++ b/activesupport/lib/active_support/configurable.rb @@ -1,7 +1,5 @@ require 'active_support/concern' require 'active_support/ordered_options' -require 'active_support/core_ext/kernel/singleton_class' -require 'active_support/core_ext/module/delegation' require 'active_support/core_ext/array/extract_options' module ActiveSupport -- cgit v1.2.3 From ffb0c5185c649f3ef132c9f308384e60a01de9b0 Mon Sep 17 00:00:00 2001 From: Sergey Nartimov Date: Wed, 18 Jan 2012 05:02:04 +0300 Subject: simplify some TaggedLogging methods --- activesupport/lib/active_support/tagged_logging.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/activesupport/lib/active_support/tagged_logging.rb b/activesupport/lib/active_support/tagged_logging.rb index 4e2e1a1ff5..b60bc94db4 100644 --- a/activesupport/lib/active_support/tagged_logging.rb +++ b/activesupport/lib/active_support/tagged_logging.rb @@ -22,7 +22,7 @@ module ActiveSupport tags.concat new_tags yield ensure - new_tags.size.times { tags.pop } + tags.pop(new_tags.size) end def add(severity, message = nil, progname = nil, &block) @@ -51,7 +51,7 @@ module ActiveSupport def tags_text tags = current_tags if tags.any? - tags.collect { |tag| "[#{tag}]" }.join(" ") + " " + tags.collect { |tag| "[#{tag}] " }.join end end -- cgit v1.2.3