1 files changed, 15 insertions, 15 deletions
diff --git a/activesupport/lib/active_support/core_ext/time/conversions.rb b/activesupport/lib/active_support/core_ext/time/conversions.rb
index d9d5e02778..10ca26acf2 100644
--- a/activesupport/lib/active_support/core_ext/time/conversions.rb
+++ b/activesupport/lib/active_support/core_ext/time/conversions.rb
@@ -1,16 +1,22 @@
 require 'active_support/inflector/methods'
-require 'active_support/core_ext/time/publicize_conversion_methods'
 require 'active_support/values/time_zone'
 
 class Time
   DATE_FORMATS = {
-    :db           => "%Y-%m-%d %H:%M:%S",
-    :number       => "%Y%m%d%H%M%S",
-    :time         => "%H:%M",
-    :short        => "%d %b %H:%M",
-    :long         => "%B %d, %Y %H:%M",
-    :long_ordinal => lambda { |time| time.strftime("%B #{ActiveSupport::Inflector.ordinalize(time.day)}, %Y %H:%M") },
-    :rfc822       => lambda { |time| time.strftime("%a, %d %b %Y %H:%M:%S #{time.formatted_offset(false)}") }
+    :db           => '%Y-%m-%d %H:%M:%S',
+    :number       => '%Y%m%d%H%M%S',
+    :nsec         => '%Y%m%d%H%M%S%9N',
+    :time         => '%H:%M',
+    :short        => '%d %b %H:%M',
+    :long         => '%B %d, %Y %H:%M',
+    :long_ordinal => lambda { |time|
+      day_format = ActiveSupport::Inflector.ordinalize(time.day)
+      time.strftime("%B #{day_format}, %Y %H:%M")
+    },
+    :rfc822       => lambda { |time|
+      offset_format = time.formatted_offset(false)
+      time.strftime("%a, %d %b %Y %H:%M:%S #{offset_format}")
+    }
   }
 
   # Converts to a formatted string. See DATE_FORMATS for builtin formats.
@@ -35,7 +41,7 @@ class Time
   # or Proc instance that takes a time argument as the value.
   #
   #   # config/initializers/time_formats.rb
-  #   Time::DATE_FORMATS[:month_and_year] = "%B %Y"
+  #   Time::DATE_FORMATS[:month_and_year] = '%B %Y'
   #   Time::DATE_FORMATS[:short_ordinal] = lambda { |time| time.strftime("%B #{time.day.ordinalize}") }
   def to_formatted_s(format = :default)
     if formatter = DATE_FORMATS[format]
@@ -54,10 +60,4 @@ class Time
   def formatted_offset(colon = true, alternate_utc_string = nil)
     utc? && alternate_utc_string || ActiveSupport::TimeZone.seconds_to_utc_offset(utc_offset, colon)
   end
-
-  # A method to keep Time, Date and DateTime instances interchangeable on conversions.
-  # In this case, it simply returns +self+.
-  def to_time
-    self
-  end unless method_defined?(:to_time)
 end