Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/elixir/lib/calendar/datetime.ex
Original file line number Diff line number Diff line change
Expand Up @@ -1576,15 +1576,15 @@ defmodule DateTime do
def diff(datetime1, datetime2, unit \\ :second)

def diff(datetime1, datetime2, :day) do
diff(datetime1, datetime2, :second) |> div(86400)
diff(datetime1, datetime2, :microsecond) |> div(86_400_000_000)
end

def diff(datetime1, datetime2, :hour) do
diff(datetime1, datetime2, :second) |> div(3600)
diff(datetime1, datetime2, :microsecond) |> div(3_600_000_000)
end

def diff(datetime1, datetime2, :minute) do
diff(datetime1, datetime2, :second) |> div(60)
diff(datetime1, datetime2, :microsecond) |> div(60_000_000)
end

def diff(
Expand Down
6 changes: 3 additions & 3 deletions lib/elixir/lib/calendar/naive_datetime.ex
Original file line number Diff line number Diff line change
Expand Up @@ -541,15 +541,15 @@ defmodule NaiveDateTime do
def diff(naive_datetime1, naive_datetime2, unit \\ :second)

def diff(naive_datetime1, naive_datetime2, :day) do
diff(naive_datetime1, naive_datetime2, :second) |> div(86400)
diff(naive_datetime1, naive_datetime2, :microsecond) |> div(86_400_000_000)
end

def diff(naive_datetime1, naive_datetime2, :hour) do
diff(naive_datetime1, naive_datetime2, :second) |> div(3600)
diff(naive_datetime1, naive_datetime2, :microsecond) |> div(3_600_000_000)
end

def diff(naive_datetime1, naive_datetime2, :minute) do
diff(naive_datetime1, naive_datetime2, :second) |> div(60)
diff(naive_datetime1, naive_datetime2, :microsecond) |> div(60_000_000)
end

def diff(
Expand Down
4 changes: 2 additions & 2 deletions lib/elixir/lib/calendar/time.ex
Original file line number Diff line number Diff line change
Expand Up @@ -901,11 +901,11 @@ defmodule Time do
def diff(time1, time2, unit \\ :second)

def diff(time1, time2, :hour) do
diff(time1, time2, :second) |> div(3600)
diff(time1, time2, :microsecond) |> div(3_600_000_000)
end

def diff(time1, time2, :minute) do
diff(time1, time2, :second) |> div(60)
diff(time1, time2, :microsecond) |> div(60_000_000)
end

def diff(
Expand Down
1 change: 1 addition & 0 deletions lib/elixir/test/elixir/calendar/datetime_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -817,6 +817,7 @@ defmodule DateTimeTest do
|> DateTime.add(-1, :microsecond)

assert DateTime.diff(in_almost_7_days, datetime, :day) == 6
assert DateTime.diff(datetime, in_almost_7_days, :day) == -6
end

test "in microseconds" do
Expand Down
6 changes: 6 additions & 0 deletions lib/elixir/test/elixir/calendar/naive_datetime_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,12 @@ defmodule NaiveDateTimeTest do
:day
) == 0

assert NaiveDateTime.diff(
~N[2000-01-01 00:00:00.700000],
~N[2000-01-02 00:00:00.200000],
:day
) == 0

assert NaiveDateTime.diff(
~N[2000-01-01 00:00:00.001200],
~N[2000-01-01 00:00:00.000700],
Expand Down
6 changes: 6 additions & 0 deletions lib/elixir/test/elixir/calendar/time_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,12 @@ defmodule TimeTest do
assert Time.diff(time1_holocene, time2, :second) == -17883
assert Time.diff(time1_holocene, time2, :millisecond) == -17_882_889
assert Time.diff(time1_holocene, time2, :microsecond) == -17_882_889_000

# Two times of day are always less than 24 hours apart, so neither
# direction can amount to a full day.
assert Time.diff(~T[23:59:59.999999], ~T[00:00:00.000001], :hour) == 23
assert Time.diff(~T[00:00:00.000001], ~T[23:59:59.999999], :hour) == -23
assert Time.diff(~T[00:00:00.000001], ~T[23:59:59.999999], :minute) == -1439
end

test "truncate/2" do
Expand Down
Loading