Fixed Time#- to handle different kinds. Fixes #3307

crystal-lang · Sep 14, 2016 · 803a20f · 803a20f
1 parent 7aad33e
commit 803a20f
Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/spec/std/time/time_spec.cr b/spec/std/time/time_spec.cr
@@ -619,6 +619,13 @@ describe Time do
     end
   end
 
+  it "does diff of utc vs local time" do
+    local = Time.now
+    utc = local.to_utc
+    (utc - local).should eq(0.seconds)
+    (local - utc).should eq(0.seconds)
+  end
+
   typeof(Time.now.year)
   typeof(1.minute.from_now.year)
   typeof(1.minute.ago.year)

diff --git a/src/time.cr b/src/time.cr
@@ -213,7 +213,13 @@ struct Time
   end
 
   def -(other : Time)
-    Span.new(ticks - other.ticks)
+    if local? && other.utc?
+      self - other.to_local
+    elsif utc? && other.local?
+      self - other.to_utc
+    else
+      Span.new(ticks - other.ticks)
+    end
   end
 
   def self.now : self