Fix hashing of Dates.Time. Fixes #29480 (#29742)

(cherry picked from commit 1db6047)
JuliaLang · Oct 29, 2018 · 116b091 · 116b091
1 parent ebbaf5d
commit 116b091
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/stdlib/Dates/src/types.jl b/stdlib/Dates/src/types.jl
@@ -350,6 +350,9 @@ function ==(a::Time, b::Time)
         microsecond(a) == microsecond(b) && nanosecond(a) == nanosecond(b)
 end
 (==)(x::TimeType, y::TimeType) = (===)(promote(x, y)...)
+Base.hash(x::Time, h::UInt) =
+    hash(hour(x), hash(minute(x), hash(second(x),
+        hash(millisecond(x), hash(microsecond(x), hash(nanosecond(x), h))))))
 
 import Base: sleep, Timer, timedwait
 sleep(time::Period) = sleep(toms(time) / 1000)

diff --git a/stdlib/Dates/test/types.jl b/stdlib/Dates/test/types.jl
@@ -194,6 +194,10 @@ c = Dates.Time(0)
     @test isfinite(Dates.Date)
     @test isfinite(Dates.DateTime)
     @test isfinite(Dates.Time)
+    @test c == c
+    @test c == (c + Dates.Hour(24))
+    @test hash(c) == hash(c + Dates.Hour(24))
+    @test hash(c + Dates.Nanosecond(10)) == hash(c + Dates.Hour(24) + Dates.Nanosecond(10))
 end
 @testset "Date-DateTime conversion/promotion" begin
     global a, b, c, d